summaryrefslogtreecommitdiff
path: root/indra/llxuixml/llxuiparser.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-16 11:58:16 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-16 11:58:16 -0700
commit712d4585950230ebd5ba66b3c60982ebcf6ebce9 (patch)
treedfdc5af716d83250c0be5b34eaf01cd66c1b1dee /indra/llxuixml/llxuiparser.cpp
parent9e00dc0cc0af26d85d5613e8bddc03067e37c7d2 (diff)
parentc10832bb9ade5efa2a501cb3b39f769aa3024363 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llxuixml/llxuiparser.cpp')
-rw-r--r--indra/llxuixml/llxuiparser.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index 72a7bb7af5..4af077b22c 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -440,12 +440,11 @@ bool LLXUIParser::readXUIImpl(LLXMLNodePtr nodep, LLInitParam::BaseBlock& block)
&& nodep->mAttributes.empty()
&& nodep->getSanitizedValue().empty())
{
- // empty node, just parse as NoValue
+ // empty node, just parse as flag
mCurReadNode = DUMMY_NODE;
return block.submitValue(mNameStack, *this, silent);
}
-
// submit attributes for current node
values_parsed |= readAttributes(nodep, block);