summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelappearance.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:28:32 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-27 12:28:32 +0100
commite5273960de222ffae32405fde8e9fd566ff72d0a (patch)
treee4dbc9e0669f49f3e222ee9b3e8856700e300c98 /indra/newview/llsidepanelappearance.cpp
parent63200e2a5bfc7538fd8114464000f35798670f23 (diff)
parent423398081b5c4402ebc162c43eaf29acdeb9f423 (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llsidepanelappearance.cpp')
-rw-r--r--indra/newview/llsidepanelappearance.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp
index 010d593b27..707fc1555a 100644
--- a/indra/newview/llsidepanelappearance.cpp
+++ b/indra/newview/llsidepanelappearance.cpp
@@ -344,10 +344,10 @@ void LLSidepanelAppearance::toggleWearableEditPanel(BOOL visible, LLWearable *we
// Toggle panel visibility.
mEditWearable->setVisible(visible);
- mEditWearable->setWearable(wearable);
if (visible)
{
+ mEditWearable->setWearable(wearable);
mEditWearable->onOpen(LLSD()); // currently no-op, just for consistency
if (!disable_camera_switch && gSavedSettings.getBOOL("AppearanceCameraMovement") )
{