diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-08-21 18:56:11 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-08-21 18:56:11 +0300 |
| commit | 15e59b81b0f1117384d2400619f3460dafbb7a3f (patch) | |
| tree | 33e2c5f8635465a2046838e9abeeacb0fa5bd193 /indra/newview/tests/llsechandler_basic_test.cpp | |
| parent | 10419d802f88e7636a6ca45c6025b7e19b3ca3c7 (diff) | |
| parent | 82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (diff) | |
merge
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) { |