From 7b41819377ec1c6ffc835a0a05a1acf571f46aad Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Fri, 6 Aug 2010 11:49:43 -0700
Subject: removed spurious parsing of empty text contents
---
indra/llxuixml/llxuiparser.cpp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index e010b4c125..b3cb71cd61 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -1199,11 +1199,15 @@ void LLSimpleXUIParser::endElement(const char *name)
{
if (!mTextContents.empty())
{
- mNameStack.push_back(std::make_pair(std::string("value"), newParseGeneration()));
- mCurAttributeValueBegin = mTextContents.c_str();
- mBlock->submitValue(mNameStack, *this);
- mNameStack.pop_back();
- mTextContents.clear();
+ LLStringUtil::trim(mTextContents);
+ if (!mTextContents.empty())
+ {
+ mNameStack.push_back(std::make_pair(std::string("value"), newParseGeneration()));
+ mCurAttributeValueBegin = mTextContents.c_str();
+ mBlock->submitValue(mNameStack, *this, false);
+ mNameStack.pop_back();
+ mTextContents.clear();
+ }
}
mCurReadDepth--;
S32 num_tokens_to_pop = mTokenSizeStack.back();
--
cgit v1.2.3