diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-08-26 18:54:39 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-08-26 18:54:39 -0400 |
| commit | f00b6c713347155fbde7e4c68e9656d29c13c6fc (patch) | |
| tree | 757be382d012da06b2d730f07d06eed41091fb67 /indra/newview/tests/llsecapi_test.cpp | |
| parent | a45806e17cc99961ab559f544f43691ccafa9bf2 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge. Pull in viewer-release after SSA merge.
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) { |