diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:29 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-05 13:01:29 -0700 |
| commit | e61da057397f95e0dcf8bf964e2836d3d4a80c20 (patch) | |
| tree | 14ce479af039aee249a91b1024224de8b3a09322 /indra/newview/llpanelwearing.cpp | |
| parent | 194bedbb96a6dcfe90d5b731aeca8658c83f2306 (diff) | |
| parent | fb7af4d0010f9d14cb5464bed83d9e022dbe0d1a (diff) | |
merge with viewer-development
Diffstat (limited to 'indra/newview/llpanelwearing.cpp')
| -rw-r--r-- | indra/newview/llpanelwearing.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelwearing.cpp b/indra/newview/llpanelwearing.cpp index f19b54c1d4..e2801c09bd 100644 --- a/indra/newview/llpanelwearing.cpp +++ b/indra/newview/llpanelwearing.cpp @@ -31,11 +31,11 @@ #include "lltoggleablemenu.h" #include "llappearancemgr.h" +#include "llfloatersidepanelcontainer.h" #include "llinventoryfunctions.h" #include "llinventorymodel.h" #include "llinventoryobserver.h" #include "llmenubutton.h" -#include "llsidetray.h" #include "llviewermenu.h" #include "llwearableitemslist.h" #include "llsdserialize.h" @@ -44,7 +44,7 @@ // Context menu and Gear menu helper. static void edit_outfit() { - LLSideTray::getInstance()->showPanel("sidepanel_appearance", LLSD().with("type", "edit_outfit")); + LLFloaterSidePanelContainer::showPanel("appearance", LLSD().with("type", "edit_outfit")); } ////////////////////////////////////////////////////////////////////////// |