diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:09 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 14:43:09 -0600 |
| commit | 85392acac0a10e274a3134180265b7b233d8b479 (patch) | |
| tree | 75fb561d925de0f9a723d708a33f22a6abe195bf /indra/llui/llui.cpp | |
| parent | d22584bfe51c034076d9e8df01f70628abc22f85 (diff) | |
| parent | fcd232e0fb9ebd18a1d3c967147232912425bc53 (diff) | |
merge
Diffstat (limited to 'indra/llui/llui.cpp')
| -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()) |