From f41b7bb8dff075d8c32ea03be407d20fe11e71f3 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 3 Dec 2007 19:44:04 +0000 Subject: -74901 (back out premature commit to release) --- indra/llui/lluictrlfactory.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'indra/llui') 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; -- cgit v1.3