From 7844914b03c062596812cdad1feffff700bcd45c Mon Sep 17 00:00:00 2001 From: Monroe Linden Date: Thu, 15 Jul 2010 17:07:05 -0700 Subject: 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. --- indra/newview/llpanelface.cpp | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'indra/newview/llpanelface.cpp') 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 { @@ -577,7 +575,6 @@ void LLPanelFace::getState() // Texture rotation { - childSetEnabled("tex rotate",editable); F32 rotation = 0.f; struct f6 : public LLSelectedTEGetFunctor { @@ -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); -- cgit v1.2.3