diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-08 16:48:47 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-08 16:48:47 +0100 |
| commit | 9d0a5c6e914f07c0ce3653a8196cb12014405c61 (patch) | |
| tree | 32cb5f6c4c3d96ea4af6d98b0442ab1c40bd3341 /indra/newview/llviewerinventory.cpp | |
| parent | 2f3019d670e8310f00fe4284a7fc09ee59c0f9bf (diff) | |
| parent | d17b616b1c94c136254de0bee039cdc87979b44e (diff) | |
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 8 |
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() ) |