diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-09 19:39:03 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-09 19:39:03 -0500 |
| commit | d87d73e253e377141c97b907355f116bfb8fac46 (patch) | |
| tree | 928c889a4315ab65eaa5777abea1c2507fc0d983 /indra/newview/skins | |
| parent | e11174cfe94e885bcf84190e0f1c0a9022abc6cd (diff) | |
| parent | 90640ed303184436ccac4d8a8da3588909bf4c3b (diff) | |
Automated merge with file:///Users/oz/Work/viewer-development
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_classified.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 40 |
2 files changed, 39 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_classified.xml b/indra/newview/skins/default/xui/en/panel_edit_classified.xml index ce0438fbc9..f60c1e62ac 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_classified.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_classified.xml @@ -147,7 +147,7 @@ layout="topleft" left="10" top_pad="2" - max_length="64" + max_length="256" name="classified_desc" text_color="black" word_wrap="true" /> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 9d496575c9..006d7895b2 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -17,6 +17,42 @@ name="middle_mouse"> Middle Mouse </panel.string> + <slider + can_edit_text="false" + control_name="ActiveFloaterTransparency" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0.8" + layout="topleft" + label_width="120" + label="Active floater opacity:" + left="240" + max_val="1.00" + min_val="0.00" + name="active" + show_text="true" + top="75" + width="290" /> + <slider + can_edit_text="false" + control_name="InactiveFloaterTransparency" + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0.5" + layout="topleft" + label_width="120" + label="Inctive floater opacity:" + left="240" + max_val="1.00" + min_val="0.00" + name="active" + show_text="true" + top_pad="15" + width="290" /> <icon follows="left|top" height="18" @@ -70,7 +106,7 @@ height="10" left="80" name="heading2" - width="270" + width="240" top_pad="5"> Automatic position for: </text> @@ -207,7 +243,7 @@ Automatic position for: left="80" name="UI Size:" top_pad="25" - width="300"> + width="160"> UI size </text> <slider |