summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llviewernetwork_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-07-17 08:23:42 -0400
committerNat Goodspeed <nat@lindenlab.com>2013-07-17 08:23:42 -0400
commit2b3c1bd40d11b02cb097cb3dba7a661a4b528a91 (patch)
treeab576805a69969e314e988ad90314f6888aeea28 /indra/newview/tests/llviewernetwork_test.cpp
parentcfd17448be0c464c1ca64b1e8f3260aa4e98b0ca (diff)
CHOP-962: Make LLControlGroup::declare* return LLControlVariable*
LLControlGroup::declareControl(), declareString() etc. etc. all used to return BOOL -- which no one ever examines because it unconditionally returned TRUE. Make it return the (possibly new) LLControlVariable* instead.
Diffstat (limited to 'indra/newview/tests/llviewernetwork_test.cpp')
-rwxr-xr-xindra/newview/tests/llviewernetwork_test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index a1e97ea17e..f80c02475d 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -37,10 +37,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;}
+ BOOL persist) {return NULL;}
void LLControlGroup::setString(const std::string& name, const std::string& val){}
std::string gCmdLineLoginURI;