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