livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Monroe Linden 2010-07-15 17:07:05 -07:00
parent 551f74125b
commit de65b93f08
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llpanelface.cpp
View File

@ -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);

20
indra/newview/llpanelmediasettingspermissions.cpp
View File

@ -107,7 +107,6 @@ void LLPanelMediaSettingsPermissions::draw()
if(mPermsGroupName)
{
mPermsGroupName->setNameID(group_id, true);
mPermsGroupName->setEnabled(true);
};
}
else
@ -116,7 +115,6 @@ void LLPanelMediaSettingsPermissions::draw()
{
mPermsGroupName->setNameID(LLUUID::null, TRUE);
mPermsGroupName->refresh(LLUUID::null, LLStringUtil::null, LLStringUtil::null, true);
mPermsGroupName->setEnabled(false);
};
};
}
@ -142,6 +140,12 @@ void LLPanelMediaSettingsPermissions::clearValues( void* userdata, bool editable
self->mPermsGroupControl->setEnabled(editable);
self->mPermsWorldInteract->setEnabled(editable);
self->mPermsWorldControl->setEnabled(editable);
self->getChild< LLTextBox >("controls_label")->setEnabled(editable);
self->getChild< LLTextBox >("owner_label")->setEnabled(editable);
self->getChild< LLTextBox >("group_label")->setEnabled(editable);
self->getChild< LLNameBox >("perms_group_name")->setEnabled(editable);
self->getChild< LLTextBox >("anyone_label")->setEnabled(editable);
}
////////////////////////////////////////////////////////////////////////////////
@ -216,13 +220,11 @@ void LLPanelMediaSettingsPermissions::initValues( void* userdata, const LLSD& me
self->mPermsWorldControl->setEnabled(false);
}
self->childSetEnabled("media_perms_label_owner", editable );
self->childSetText("media_perms_label_owner", LLTrans::getString("Media Perms Owner") );
self->childSetEnabled("media_perms_label_group", editable );
self->childSetText("media_perms_label_group", LLTrans::getString("Media Perms Group") );
self->childSetEnabled("media_perms_label_anyone", editable );
self->childSetText("media_perms_label_anyone", LLTrans::getString("Media Perms Anyone") );
self->getChild< LLTextBox >("controls_label")->setEnabled(editable);
self->getChild< LLTextBox >("owner_label")->setEnabled(editable);
self->getChild< LLTextBox >("group_label")->setEnabled(editable);
self->getChild< LLNameBox >("perms_group_name")->setEnabled(editable);
self->getChild< LLTextBox >("anyone_label")->setEnabled(editable);
}
////////////////////////////////////////////////////////////////////////////////

15
indra/newview/skins/default/xui/en/floater_tools.xml
View File

@ -2322,6 +2322,7 @@ even though the user gets a free copy.
layout="topleft"
left_pad="15"
name="color trans"
text_readonly_color="LabelDisabledColor"
top="6"
width="110">
Transparency %
@ -2346,6 +2347,7 @@ even though the user gets a free copy.
layout="topleft"
left_delta="0"
name="glow label"
text_readonly_color="LabelDisabledColor"
top_pad="8"
width="80">
Glow
@ -2376,6 +2378,7 @@ even though the user gets a free copy.
layout="topleft"
left="10"
name="tex gen"
text_readonly_color="LabelDisabledColor"
top_pad="5"
width="90">
Mapping
@ -2404,6 +2407,7 @@ even though the user gets a free copy.
layout="topleft"
name="label shininess"
left_pad="4"
text_readonly_color="LabelDisabledColor"
top_pad="-36"
width="90">
Shininess
@ -2440,6 +2444,7 @@ even though the user gets a free copy.
layout="topleft"
left_pad="4"
name="label bumpiness"
text_readonly_color="LabelDisabledColor"
top_pad="-36"
width="90">
Bumpiness
@ -2565,7 +2570,8 @@ even though the user gets a free copy.
height="10"
layout="topleft"
left="10"
name="tex scale"
name="rpt"
text_readonly_color="LabelDisabledColor"
top_pad="4"
width="200">
Repeats / Face
@ -2654,6 +2660,7 @@ even though the user gets a free copy.
layout="topleft"
left="10"
name="tex offset"
text_readonly_color="LabelDisabledColor"
width="200">
Texture Offset
</text>
@ -2737,9 +2744,9 @@ even though the user gets a free copy.
follows="top|left"
tool_tip="Edit this Media"
height="12"
image_disabled="Icon_Gear_Foreground"
image_selected="Icon_Gear_Background"
image_unselected="Icon_Gear_Press"
image_disabled="Icon_Gear_Background"
image_selected="Icon_Gear_Press"
image_unselected="Icon_Gear_Foreground"
layout="topleft"
left_pad="10"
name="edit_media"

15
indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml
View File

@ -16,7 +16,8 @@
follows="top|left"
height="15"
left="10"
name="controls_label">
name="controls_label"
text_readonly_color="LabelDisabledColor">
Controls:
</text>
<combo_box
@ -46,7 +47,8 @@
follows="top|left"
height="15"
left="10"
name="owner_label">
name="owner_label"
text_readonly_color="LabelDisabledColor">
Owner
</text>
@ -83,8 +85,9 @@
enabled="false"
follows="top|left"
height="15"
left="10"
name="group_label">
left="10"
name="group_label"
text_readonly_color="LabelDisabledColor">
Group:
</text>
@ -95,6 +98,7 @@
font="SansSerif"
height="20" left="60"
name="perms_group_name"
text_readonly_color="LabelDisabledColor"
value =""
width="200" />
@ -132,7 +136,8 @@
follows="top|left"
height="15"
left="10"
name="anyone_label">
name="anyone_label"
text_readonly_color="LabelDisabledColor">
Anyone
</text>