summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-13 12:44:45 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-13 12:44:45 +0100
commit0022aff49d21f932f16fbd8131523ab47c56759f (patch)
treed56a1e629858cb89775c84c2a34b2282d29b2955 /indra/newview/llviewerinventory.cpp
parent7a5f394138257957ca2f4b7c11794dfdf335e27c (diff)
parent51c8c74da5a2675b5bdd016579f891f2729dfb54 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r--indra/newview/llviewerinventory.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index face7124c2..40f15fe86a 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -883,12 +883,8 @@ void ModifiedCOFCallback::fire(const LLUUID& inv_item)
{
LLAppearanceMgr::instance().updateAppearanceFromCOF();
- if (LLSideTray::getInstance()->isPanelActive("sidepanel_appearance"))
- {
- // *HACK: Edit the wearable that has just been worn
- // only if the Appearance SP is currently opened.
- LLAgentWearables::editWearable(inv_item);
- }
+ // Start editing the item if previously requested.
+ gAgentWearables.editWearableIfRequested(inv_item);
// TODO: camera mode may not be changed if a debug setting is tweaked
if( gAgentCamera.cameraCustomizeAvatar() )