diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-11-28 11:34:53 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-11-28 11:34:53 -0700 |
| commit | fcd232e0fb9ebd18a1d3c967147232912425bc53 (patch) | |
| tree | bfb7a9213e8a3da483a42cc69f16fa1a9e185b3c /indra/llui | |
| parent | a375272ff5cabb97593129523d4e326cb3d0fda2 (diff) | |
| parent | 2851cd519338ef4a1fde15da8d4015ab4380d6cb (diff) | |
Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llui.cpp | 7 |
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()) |