summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-08-05 14:18:55 -0700
committerMonroe Linden <monroe@lindenlab.com>2010-08-05 14:18:55 -0700
commita974ed98d04d05d9c682e85d3b25cf591d2b58c0 (patch)
treeb22428a1ab38fbb7008f8b5ab7ee76d949b96a9d /indra
parentd26e380a06b343bc46010922de46e9664831e3b4 (diff)
Fix for a crash on startup.
Richard sent me the diff for this one, just pushing it on his behalf.
Diffstat (limited to 'indra')
-rw-r--r--indra/llxuixml/llxuiparser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llxuixml/llxuiparser.cpp b/indra/llxuixml/llxuiparser.cpp
index 16571a9969..fe85ac41cc 100644
--- a/indra/llxuixml/llxuiparser.cpp
+++ b/indra/llxuixml/llxuiparser.cpp
@@ -1122,6 +1122,7 @@ void LLFastXUIParser::startElement(const char *name, const char **atts)
{
mNameStack.push_back(std::make_pair(child_name, newParseGeneration()));
num_tokens_pushed++;
+ mScope.push_back(child_name);
}
else
{
@@ -1154,7 +1155,7 @@ void LLFastXUIParser::startElement(const char *name, const char **atts)
}
else
{
- mScope.push_back(name);
+ mScope.push_back(child_name);
}
mTokenSizeStack.push_back(num_tokens_pushed);