diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 09:00:01 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 09:00:01 -0400 |
| commit | 1bcce503a958e39d92206e8e0539fe664fdd1ece (patch) | |
| tree | f74e53e37177d39b243a9c66a69d6a6a8badaf9a /indra/newview/tests/llsechandler_basic_test.cpp | |
| parent | 10c8fbbedbee07355f71ef206c50957a422d7ccf (diff) | |
| parent | f7cdbb2582d6328e62220dc4955c89bafcad5565 (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951
Diffstat (limited to 'indra/newview/tests/llsechandler_basic_test.cpp')
| -rwxr-xr-x | indra/newview/tests/llsechandler_basic_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llsechandler_basic_test.cpp b/indra/newview/tests/llsechandler_basic_test.cpp index 3fbb45f8b4..2a8dc15346 100755 --- a/indra/newview/tests/llsechandler_basic_test.cpp +++ b/indra/newview/tests/llsechandler_basic_test.cpp @@ -74,7 +74,7 @@ LLControlGroup::~LLControlGroup() {} LLControlVariable* LLControlGroup::declareString(const std::string& name, const std::string& initial_val, const std::string& comment, - BOOL persist) {return NULL;} + LLControlVariable::ePersist persist) {return NULL;} void LLControlGroup::setString(const std::string& name, const std::string& val){} std::string LLControlGroup::getString(const std::string& name) { |