diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-09-30 13:28:55 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-09-30 13:28:55 -0700 |
| commit | dc2dadbbe62764a2b455e8ac6657407bad9bbd6d (patch) | |
| tree | 667776f36e74485200d8ae08359f7468f9621f25 /indra/newview/llappearancemgr.cpp | |
| parent | c598b41c590ccd5965567f6f028747a02e597567 (diff) | |
| parent | 4ac6eed116a888e113d6f4f031e57e09a141b55a (diff) | |
Pull from sergeylproductengine/viewer-experience-fui/
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index c638f881a5..e5369dc2b8 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -44,7 +44,6 @@ #include "lloutfitslist.h" #include "llselectmgr.h" #include "llsidepanelappearance.h" -#include "llsidetray.h" #include "llviewerobjectlist.h" #include "llvoavatar.h" #include "llvoavatarself.h" @@ -2466,7 +2465,8 @@ public: // add may be processed after login process is finished if (mShowPanel) { - LLSideTray::getInstance()->showPanel("panel_outfits_inventory", key); + LLFloaterSidePanelContainer::showPanel("appearance", "panel_outfits_inventory", key); + } LLOutfitsList *outfits_list = dynamic_cast<LLOutfitsList*>(LLFloaterSidePanelContainer::getPanel("appearance", "outfitslist_tab")); |