diff options
Diffstat (limited to 'indra/newview/skins/default')
5 files changed, 27 insertions, 21 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index aec71fda07..0c4d342297 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -55,6 +55,7 @@ left_pad="10" max_length_bytes="100" name="day_cycle_name" + prevalidate_callback="ascii" top="5" width="200" height="21" /> diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml index 9b572ce9b0..7cf7e8bb32 100644 --- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -43,6 +43,7 @@ left_delta="45" width="250" name="settings_name" + prevalidate_callback="ascii" max_length_chars="32" height="20"/> <button diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index b6bc271cf1..8af754ffec 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -698,8 +698,8 @@ parameter="midnight" /> </menu_item_check> <menu_item_check - label="Use Region Settings" - name="Use Region Settings"> + label="Use Shared Environment" + name="Use Shared Environment"> <menu_item_check.on_click function="World.EnvSettings" parameter="region" /> diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index 8229dcb91d..3ce0d7a2ef 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -13,7 +13,9 @@ <string name="str_label_use_region">Use Region Settings</string> <string name="str_unknow_inventory">Unknown</string> <string name="str_altitude_desription">Sky [INDEX]([ALTITUDE]m)</string> - + <string name="str_no_parcel">No parcel is selected. Environmental settings are disabled.</string> + <string name="str_cross_region">Environmental settings are not available across region boundries.</string> + <string name="str_legacy">Environmental settings are not available on this region.</string> <layout_stack width="530" height="367" @@ -26,13 +28,12 @@ name="pnl_environment_disabled" visible="false"> <text follows="top|left|bottom|right" - font="SansSerif" halign="center" valign="top" - top_pad="20" + top_pad="40" + name="txt_environment_disabled" text_color="white"> -No Parcel parcel is selected. Environmental -settings are disabled. + ... </text> </layout_panel> <layout_panel @@ -237,8 +238,8 @@ settings are disabled. <multi_slider decimal_digits="0" follows="bottom" - height="120" - width="10" + height="123" + width="17" orientation="vertical" increment="10" initial_value="100" @@ -248,22 +249,25 @@ settings are disabled. top="20" max_sliders="20" name="sld_altitudes" - show_text="false"> + show_text="false" + thumb_image="Inv_SettingsSky" + thumb_width="17" + thumb_highlight_color="white"> <slider name="sld1" value="200"/> <slider name="sld2" value="400"/> <slider name="sld3" value="600"/> </multi_slider> <icon follows="left|top" - height="10" - width="10" - image_name="Rounded_Square" + height="17" + width="17" + image_name="Inv_SettingsSky" layout="topleft" - name="camera_icon" + name="icon_ground" mouse_opaque="false" visible="true" left_delta="0" - top_pad="-3"/> + top_pad="-9"/> <text type="string" length="1" @@ -282,7 +286,7 @@ settings are disabled. follows="left" height="12" layout="topleft" - left="25" + left="35" top="30" width="200" name="alt1"> @@ -294,7 +298,7 @@ settings are disabled. follows="left|top" height="12" layout="topleft" - left="25" + left="35" top="40" width="200" name="alt2"> @@ -306,7 +310,7 @@ settings are disabled. follows="left|top" height="12" layout="topleft" - left="25" + left="35" top="50" width="200" name="alt3"> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3a882a73d3..76d040150d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -404,9 +404,9 @@ http://secondlife.com/support for help fixing this problem. <string name="simstate">simstate</string> <string name="favorite">favorite</string> <string name="symbolic link">link</string> - <string name="symbolic folder link">folder link</string> - <string name="mesh">mesh</string> - <string name="settings">settings</string> + <string name="settings blob">settings</string> + <string name="symbolic folder link">folder link</string> + <string name="mesh">mesh</string> <!-- llvoavatar. Displayed in the avatar chat bubble --> <string name="AvatarEditingAppearance">(Editing Appearance)</string> |