diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-27 22:32:26 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-09-27 22:32:26 +0300 |
| commit | 87db6c59ee2ac5f8cc304d6f8150af5f91e3fb8d (patch) | |
| tree | cb92fa524273029044cb40fd5e8c515161840924 /indra/newview/llsidepanelappearance.cpp | |
| parent | 0f3221e25d6261d7f29b5b37391156c07fde1d0c (diff) | |
| parent | 3c8b0ab537049141b5ce6201fdf611ff09784df4 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
| -rw-r--r-- | indra/newview/llsidepanelappearance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 28ec11d1c7..a356013830 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -32,6 +32,7 @@ #include "llagentcamera.h" #include "llagentwearables.h" #include "llappearancemgr.h" +#include "llfloatersidepanelcontainer.h" #include "llfolderview.h" #include "llinventorypanel.h" #include "llfiltereditor.h" @@ -456,7 +457,7 @@ void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name) //static void LLSidepanelAppearance::editWearable(LLWearable *wearable, LLView *data, BOOL disable_camera_switch) { - LLSideTray::getInstance()->showPanel("sidepanel_appearance"); + LLFloaterSidePanelContainer::showPanel("appearance", LLSD()); LLSidepanelAppearance *panel = dynamic_cast<LLSidepanelAppearance*>(data); if (panel) |