summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llviewernetwork_test.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2013-07-26 10:42:58 -0400
committerNat Goodspeed <nat@lindenlab.com>2013-07-26 10:42:58 -0400
commit0906d000b36d4da2116e0b9347a37598c918ce08 (patch)
treec0b54b68623ed6922a890a7fdf057886a0af3729 /indra/newview/tests/llviewernetwork_test.cpp
parenta207b24d331539e16bd66ca09df3c585529c99f0 (diff)
parent1bcce503a958e39d92206e8e0539fe664fdd1ece (diff)
CHOP-955: merge viewer_manifest.py file_list fix
Diffstat (limited to 'indra/newview/tests/llviewernetwork_test.cpp')
-rwxr-xr-xindra/newview/tests/llviewernetwork_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/tests/llviewernetwork_test.cpp b/indra/newview/tests/llviewernetwork_test.cpp
index f80c02475d..06de1cbfa2 100755
--- a/indra/newview/tests/llviewernetwork_test.cpp
+++ b/indra/newview/tests/llviewernetwork_test.cpp
@@ -40,7 +40,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 gCmdLineLoginURI;