diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
| commit | f4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (patch) | |
| tree | f0b89a006e52e38039d142048adf9034cbcb2b76 /indra/newview/tests/llsecapi_test.cpp | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
| parent | 7f6e7fc0cb15d5367d48a3d8084d1a0b319575b7 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/tests/llsecapi_test.cpp')
| -rwxr-xr-x | indra/newview/tests/llsecapi_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llsecapi_test.cpp b/indra/newview/tests/llsecapi_test.cpp index 703603e2db..d7e87ed52e 100755 --- a/indra/newview/tests/llsecapi_test.cpp +++ b/indra/newview/tests/llsecapi_test.cpp @@ -39,10 +39,10 @@ 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) { |