summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2011-11-28 11:33:49 -0700
committerXiaohong Bao <bao@lindenlab.com>2011-11-28 11:33:49 -0700
commit2851cd519338ef4a1fde15da8d4015ab4380d6cb (patch)
treee293f42016c3ce1a8e7ddb0f015ba72287381f33 /indra/llui
parentbe3c6747a88d8bbb2c6b87c9eb97b14a42b90ae7 (diff)
a try fix for sh-2651: [crashhunters] Crash after google translate failure
and sh-2658: crash in LLPluginMessage::parse
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llui.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index 79ad99a770..69461ec099 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -1823,9 +1823,12 @@ void LLUI::setupPaths()
LLXMLNodePtr root;
BOOL success = LLXMLNode::parseFile(filename, root, NULL);
Paths paths;
- LLXUIParser parser;
- parser.readXUI(root, paths, filename);
+ if(success)
+ {
+ LLXUIParser parser;
+ parser.readXUI(root, paths, filename);
+ }
sXUIPaths.clear();
if (success && paths.validateBlock())