summaryrefslogtreecommitdiff
path: root/indra/newview/llfavoritesbar.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-08-25 16:47:07 -0700
committerRichard Linden <none@none>2010-08-25 16:47:07 -0700
commit3604f7fe4b35758db3a730e5efa4a06b2326bdfb (patch)
treeee8d4d7078c33eb20a773686a1c367e5a2e00cdb /indra/newview/llfavoritesbar.cpp
parentc1405887c982f5a7396892017e4ea426ede9af23 (diff)
parenta0b15c827ee7704c1557c9c882ec236d5d67f948 (diff)
merge
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
-rw-r--r--indra/newview/llfavoritesbar.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index 18a6ac031f..751d5b8fcd 100644
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -667,9 +667,10 @@ const LLButton::Params& LLFavoritesBarCtrl::getButtonParams()
{
LLXMLNodePtr button_xml_node;
if(LLUICtrlFactory::getLayeredXMLNode("favorites_bar_button.xml", button_xml_node))
- {
- LLXUIParser::instance().readXUI(button_xml_node, button_params, "favorites_bar_button.xml");
- }
+ {
+ LLXUIParser parser;
+ parser.readXUI(button_xml_node, button_params, "favorites_bar_button.xml");
+ }
params_initialized = true;
}