diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-06-21 17:16:27 +0000 |
commit | ade6bbb06c6a842f39a3fe32decf7c66682df092 (patch) | |
tree | 8fa1e4ba680f916bb4c77c70f2464f295a3bd3f3 /indra/newview/llfavoritesbar.cpp | |
parent | 9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8 (diff) |
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
Diffstat (limited to 'indra/newview/llfavoritesbar.cpp')
-rw-r--r-- | indra/newview/llfavoritesbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 7719af2bd7..0e5b943dd3 100644 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -367,7 +367,7 @@ BOOL LLFavoritesBarCtrl::postBuild() LLMenuGL* menu = LLUICtrlFactory::getInstance()->createFromFile<LLMenuGL>("menu_favorites.xml", gMenuHolder); if (!menu) { - menu = LLUICtrlFactory::createDummyWidget<LLMenuGL>("inventory_menu"); + menu = LLUICtrlFactory::getDefaultWidget<LLMenuGL>("inventory_menu"); } menu->setBackgroundColor(gSavedSkinSettings.getColor("MenuPopupBgColor")); mInventoryItemsPopupMenuHandle = menu->getHandle(); |