summaryrefslogtreecommitdiff
path: root/indra/llxuixml/llinitparam.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-30 16:58:09 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-30 16:58:09 -0700
commit0991a8a870b9cfee57a76f45f4f5ee1c5eb6d4cd (patch)
tree2c503e2bec1398185e41875b3c357e5afb126c2b /indra/llxuixml/llinitparam.cpp
parent6fe4815217a11a36aa2e2b1d8b040eff007bb631 (diff)
parent09e179b2381a4db03309839babae664feb9b0886 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/llxuixml/llinitparam.cpp')
-rw-r--r--indra/llxuixml/llinitparam.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llxuixml/llinitparam.cpp
index c024fd405e..99016205c8 100644
--- a/indra/llxuixml/llinitparam.cpp
+++ b/indra/llxuixml/llinitparam.cpp
@@ -365,7 +365,7 @@ namespace LLInitParam
// verify by calling readValue with NoParamValue type, an inherently unparseable type
if (!names_left)
{
- NoParamValue no_value;
+ Flag no_value;
return p.readValue(no_value);
}