Revert "#4008 Fix media scale adjustments with pbr applied"

This reverts commit b084d842c9900e532cba11e1e5a4e85299a0e184.

1 files changed, 6 insertions, 7 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index a7b50f8364..99471a2555 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1099,7 +1099,6 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         }
         mRadioPbrType->setEnabled(editable);
         const bool pbr_selected = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR;
-        const bool media_selected = mComboMatMedia->getCurrentIndex() == MATMEDIA_MEDIA;
         const bool texture_info_selected = pbr_selected && mRadioPbrType->getSelectedIndex() != PBRTYPE_RENDER_MATERIAL_ID;
 
         mCheckSyncSettings->setEnabled(editable);
@@ -1403,7 +1402,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             mShinyScaleU->setValue(spec_scale_s);
             mBumpyScaleU->setValue(norm_scale_s);
 
-            mTexScaleU->setEnabled(editable && (has_material || media_selected));
+            mTexScaleU->setEnabled(editable && has_material);
             mShinyScaleU->setEnabled(editable && has_material && specmap_id.notNull());
             mBumpyScaleU->setEnabled(editable && has_material && normmap_id.notNull());
 
@@ -1442,7 +1441,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             bool norm_scale_tentative = !identical_norm_scale_t;
             bool spec_scale_tentative = !identical_spec_scale_t;
 
-            mTexScaleV->setEnabled(editable && (has_material || media_selected));
+            mTexScaleV->setEnabled(editable && has_material);
             mShinyScaleV->setEnabled(editable && has_material && specmap_id.notNull());
             mBumpyScaleV->setEnabled(editable && has_material && normmap_id.notNull());
 
@@ -1488,7 +1487,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             mShinyOffsetU->setTentative(LLSD(spec_offset_u_tentative));
             mBumpyOffsetU->setTentative(LLSD(norm_offset_u_tentative));
 
-            mTexOffsetU->setEnabled(editable && (has_material || media_selected));
+            mTexOffsetU->setEnabled(editable && has_material);
             mShinyOffsetU->setEnabled(editable && has_material && specmap_id.notNull());
             mBumpyOffsetU->setEnabled(editable && has_material && normmap_id.notNull());
         }
@@ -1518,7 +1517,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             mBumpyOffsetV->setTentative(LLSD(norm_offset_v_tentative));
             mShinyOffsetV->setTentative(LLSD(spec_offset_v_tentative));
 
-            mTexOffsetV->setEnabled(editable && (has_material || media_selected));
+            mTexOffsetV->setEnabled(editable && has_material);
             mShinyOffsetV->setEnabled(editable && has_material && specmap_id.notNull());
             mBumpyOffsetV->setEnabled(editable && has_material && normmap_id.notNull());
         }
@@ -1545,7 +1544,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             F32 norm_rot_deg = norm_rotation * RAD_TO_DEG;
             F32 spec_rot_deg = spec_rotation * RAD_TO_DEG;
 
-            mTexRotate->setEnabled(editable && (has_material || media_selected));
+            mTexRotate->setEnabled(editable && has_material);
             mShinyRotate->setEnabled(editable && has_material && specmap_id.notNull());
             mBumpyRotate->setEnabled(editable && has_material && normmap_id.notNull());
 
@@ -1662,7 +1661,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                     mTexRepeat->setValue(editable ? repeats : 1.0f);
                 }
                 mTexRepeat->setTentative(LLSD(repeats_tentative));
-                mTexRepeat->setEnabled(!identical_planar_texgen && enabled && (has_material || media_selected));
+                mTexRepeat->setEnabled(has_material && !identical_planar_texgen && enabled);
             }
         }