From f8511d77a70bea452cde7270b47044358e58427c Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 4 Dec 2007 16:46:00 +0000 Subject: EFFECTIVE MERGE: maint-ui-qa3 -r 73391:74133 -> release ACTUAL MERGE: merge release@74893 maint-ui-3-merge@74902 -> release --- indra/llui/lluictrlfactory.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/llui/lluictrlfactory.cpp') 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; -- cgit v1.2.3