diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-12-03 19:36:44 +0000 |
| commit | d5eef2d8a6cc0d5855d68d0726565e07d46211b2 (patch) | |
| tree | 0138cd5a59971a52b20627f28af4197198f4e2f9 /indra/llui | |
| parent | 7b7dd4e6f61aa731ef7f9f255014f5b76d5b9fec (diff) | |
merge -r 73391:74133 maint-ui-3 -> release
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lluictrlfactory.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llui/lluictrlfactory.cpp b/indra/llui/lluictrlfactory.cpp index 4b4c4636d5..88e4e89a2b 100644 --- a/indra/llui/lluictrlfactory.cpp +++ b/indra/llui/lluictrlfactory.cpp @@ -282,8 +282,11 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr& if (!LLXMLNode::parseFile(mXUIPaths.front() + filename, root, NULL)) { - llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl; - return FALSE; + if (!LLXMLNode::parseFile(filename, root, NULL)) + { + llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl; + return FALSE; + } } LLXMLNodePtr updateRoot; |