Fix for EXT-8230

LLPanelMediaSettingsPermissions::initValues() was referencing both XUI elements that don't exist and strings that don't appear in strings.xml.

Also fixed a number of elements in panel_media_settings_permissions.xml and floater_tools.xml that weren't graying out properly when non-editable items were selected, and some mixed up image attributes that made the media "gear" icon states look wrong.

1 files changed, 0 insertions, 10 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 7d5be39074..e3503c065b 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -505,8 +505,6 @@ void LLPanelFace::getState()
 
 		// Texture scale
 		{
-			childSetEnabled("tex scale",editable);
-			//mLabelTexScale->setEnabled( editable );
 			F32 scale_s = 1.f;
 			struct f2 : public LLSelectedTEGetFunctor<F32>
 			{
@@ -577,7 +575,6 @@ void LLPanelFace::getState()
 
 		// Texture rotation
 		{
-			childSetEnabled("tex rotate",editable);
 			F32 rotation = 0.f;
 			struct f6 : public LLSelectedTEGetFunctor<F32>
 			{
@@ -720,14 +717,9 @@ void LLPanelFace::getState()
 
 			if (selected_texgen == 1)
 			{
-				childSetText("tex scale",getString("string repeats per meter"));
 				childSetValue("TexScaleU", 2.0f * childGetValue("TexScaleU").asReal() );
 				childSetValue("TexScaleV", 2.0f * childGetValue("TexScaleV").asReal() );
 			}
-			else
-			{
-				childSetText("tex scale",getString("string repeats per face"));
-			}
 
 		}
 
@@ -802,9 +794,7 @@ void LLPanelFace::getState()
 		}
 		childSetEnabled("color trans",FALSE);
 		childSetEnabled("rpt",FALSE);
-		childSetEnabled("tex scale",FALSE);
 		childSetEnabled("tex offset",FALSE);
-		childSetEnabled("tex rotate",FALSE);
 		childSetEnabled("tex gen",FALSE);
 		childSetEnabled("label shininess",FALSE);
 		childSetEnabled("label bumpiness",FALSE);