summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-05-25 20:17:31 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-05-25 20:17:31 -0400
commit946af937d7743656197afcfc1a4239ac71a438f1 (patch)
treea0bb82d47c578993bda3e153765e4312cede6517 /indra/newview/llviewerinventory.cpp
parent6885a1a6ad62f0e0e08a272911c8ac057a5cd94d (diff)
parentb524aacb599b8c907e02eeb56b7441f42e9ddad2 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index f0532d5a31..838f57073e 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -883,9 +883,10 @@ void ModifiedCOFCallback::fire(const LLUUID& inv_item)
if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode() )
{
// If we're in appearance editing mode, the current tab may need to be refreshed
- if (gFloaterCustomize)
+ LLSidepanelAppearance *panel = dynamic_cast<LLSidePanelAppearance*>(LLSideTray::getInstance()->getPanel("sidepanel_appearance"));
+ if (panel)
{
- gFloaterCustomize->switchToDefaultSubpart();
+ panel->showDefaultSubpart();
}
}
}