summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llviewerhelputil_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-07-25 16:46:51 -0400
committerNat Goodspeed <nat@lindenlab.com>2013-07-25 16:46:51 -0400
commitd2386652f8a44c5adcc7fbcc65741649dd90aa2b (patch)
tree3e760a558cf5cdb02d2472d294b1007a8c188142 /indra/newview/tests/llviewerhelputil_test.cpp
parent35bc91fc5dee77133fff0c0066e3e34689941dfd (diff)
CHOP-962: Make LLControlVariable::setPersist() accept only enum.
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
Diffstat (limited to 'indra/newview/tests/llviewerhelputil_test.cpp')
-rwxr-xr-xindra/newview/tests/llviewerhelputil_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llviewerhelputil_test.cpp b/indra/newview/tests/llviewerhelputil_test.cpp
index 8e9cc7111b..f6456a2839 100755
--- a/indra/newview/tests/llviewerhelputil_test.cpp
+++ b/indra/newview/tests/llviewerhelputil_test.cpp
@@ -52,7 +52,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)
{