diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-02 10:51:11 -0400 |
| commit | acda43ed3881eeab60ee9edfdf76ac8eebd723cc (patch) | |
| tree | f59c0d1a12f7a3b0dc14498a9a0f57e2a8f66ef5 /indra/newview/tests/llsechandler_basic_test.cpp | |
| parent | 32a953f65eae51850bad1b2c4c2a63d3dff12a68 (diff) | |
| parent | 0906d000b36d4da2116e0b9347a37598c918ce08 (diff) | |
CHOP-959: merge --graphicslevel fix up to tip
Diffstat (limited to 'indra/newview/tests/llsechandler_basic_test.cpp')
| -rwxr-xr-x | indra/newview/tests/llsechandler_basic_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index 0235400976..2a8dc15346 100755 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -71,10 +71,10 @@ std::string gLastName; LLControlGroup::LLControlGroup(const std::string& name) : LLInstanceTracker<LLControlGroup, std::string>(name) {} LLControlGroup::~LLControlGroup() {} -BOOL LLControlGroup::declareString(const std::string& name, +LLControlVariable* LLControlGroup::declareString(const std::string& name, const std::string& initial_val, const std::string& comment, - BOOL persist) {return TRUE;} + LLControlVariable::ePersist persist) {return NULL;} void LLControlGroup::setString(const std::string& name, const std::string& val){} std::string LLControlGroup::getString(const std::string& name) { |