summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llsecapi_test.cpp
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-08-27 16:51:05 -0700
committerdolphin <dolphin@lindenlab.com>2013-08-27 16:51:05 -0700
commitd29268f331380eb89224c5b0168bf89bd0116422 (patch)
tree47973dc2fbe434066e1de0c1695c3033eb76cc80 /indra/newview/tests/llsecapi_test.cpp
parenteaf847e60df3c078d15f8991e9448b06ffa83bf7 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge
Diffstat (limited to 'indra/newview/tests/llsecapi_test.cpp')
-rwxr-xr-xindra/newview/tests/llsecapi_test.cpp4
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)
{