diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-12-05 13:38:01 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-12-05 13:38:01 -0600 |
| commit | 46a8ee0263aff727fde98874a720d1f929d91141 (patch) | |
| tree | 603ee21e2e8ab67c5ac489c259e927b68e4c9a0d /indra/llui | |
| parent | a8cb28cb2c589a658900243f98c5c017b9a638c8 (diff) | |
| parent | a0873bf1b76b52de23b784e2c71db8d7cffd85bb (diff) | |
merge
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 33bc247987..6b74c5a6be 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1833,9 +1833,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()) |