summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorvyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com>2015-06-05 20:53:16 +0400
committervyacheslavsproductengine <vyacheslavsproductengine@lindenlab.com>2015-06-05 20:53:16 +0400
commita2bd04ca244f55fe807c9e9d74311580f12e6d0f (patch)
treeb05c60bbc3bbfe457a280c1226f723a2f99608bd /indra/newview
parentb59770199afae70f8fa14b3f050d5f5d4818cb07 (diff)
MAINT-5186 FIXED (Avatar textures do not load in the Appearance editor after disabling an Alpha mask)
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llpaneleditwearable.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp
index 9bd6007772..b7e1b2d3a4 100755
--- a/indra/newview/llpaneleditwearable.cpp
+++ b/indra/newview/llpaneleditwearable.cpp
@@ -1168,6 +1168,8 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
targetPanel->setVisible(show);
toggleTypeSpecificControls(type);
+ // Update type controls here
+ updateTypeSpecificControls(type);
if (show)
{
@@ -1179,7 +1181,6 @@ void LLPanelEditWearable::showWearable(LLViewerWearable* wearable, BOOL show, BO
mNameEditor->setText(mWearableItem->getName());
updatePanelPickerControls(type);
- updateTypeSpecificControls(type);
// clear and rebuild visual param list
U8 num_subparts = wearable_entry->mSubparts.size();