diff options
Diffstat (limited to 'indra/newview/skins/default/xui')
8 files changed, 314 insertions, 79 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 1ccd953b3b..c3f94f9aa3 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 @@ -3,13 +3,14 @@ layout="topleft" name="env_edit_extdaycycle" help_topic="day_presets" - save_rect="true" + save_rect="false" title="Edit Day Cycle" width="705" height="650" min_width="705" min_height="650" - can_resize="true"> + single_instance="true" + can_resize="false"> <!-- obsolete?, add as hint for 'save' button? --> <string name="title_new">Create a New Day Cycle</string> @@ -400,9 +401,17 @@ width="90" label="Add Frame" left_pad="175" - top_delta="-12" + top_delta="-20" name="add_frame" /> <button + follows="top|left" + height="23" + width="90" + label="Load Frame" + top_pad="0" + left_delta="0" + name="btn_load_frame" /> + <button follows="left|top" height="23" width="90" @@ -421,36 +430,18 @@ visible="true"> <!--bg_alpha_color="blue" background_visible="true" --> - <icon - border="1" - bevel_style="out" + <text name="icn_lock_edit" - layout="bottomleft" follows="bottom" - image_name="Locked_Icon" - bottom="4" - left="5" - height="15" - width="15" - tab_stop="false" - visible="false" - tool_tip="Select a key frame above to edit settings"/> - <button - name="btn_load_frame" - follows="top" - image_overlay="Command_Inventory_Icon" - image_disabled="PushButton_Disabled" - image_disabled_selected="PushButton_Disabled" - image_selected="PushButton_Selected" - image_unselected="PushButton_Off" - hover_glow_amount="0.15" - auto_resize="false" - layout="topleft" - height="30" - width="30" - left="25" - top="1" - tool_tip="Replace frame with settings from inventory"/> + height="10" + layout="bottomleft" + left_delta="15" + top_pad="15" + font="SansSerif" + text_color="Yellow" + width="500"> +Select a key frame from the timeline above to edit settings. + </text> </layout_panel> <layout_panel name="frame_settings_water" auto_resize="true" @@ -537,7 +528,7 @@ layout="topleft" left_delta="0" top_pad="5" - name="advanced_atmo_panel" /> + name="sky_density_panel" /> </tab_container> </layout_panel> </layout_stack> diff --git a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml index f88618fb71..36462dcd02 100644 --- a/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml +++ b/indra/newview/skins/default/xui/en/floater_fixedenvironment.xml @@ -2,20 +2,19 @@ <floater can_minimize="false" can_tear_off="false" - can_resize="true" + can_resize="false" can_drag_on_left="false" can_close="true" - can_dock="true" + can_dock="false" bevel_style="in" - height="500" + height="550" layout="topleft" name="Fixed Environment" save_rect="true" title="Fixed Environment" - save_dock_state="true" - save_visibility="true" + save_visibility="false" single_instance="true" - width="650"> + width="750"> <layout_stack name="floater_stack" left="5" top="5" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index f011fe0aaa..2ab22cb565 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11183,5 +11183,19 @@ Settings are not supported on this region. Please move to a settings enabled region and retry your action. <tag>fail</tag> </notification> + + <notification + icon="alertmodal.tga" + name="SettingsConfirmLoss" + type="alertmodal"> +You are about to lose the changes you have made to this [TYPE] named "[NAME]". +Are you sure you want to continue? + <tag>confirm</tag> + <usetemplate + ignoretext="Are you sure you want to lose changes?" + name="okcancelignore" + notext="No" + yestext="Yes"/> + </notification> </notifications> 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 3a1a8c432a..557e093f51 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -29,8 +29,8 @@ valign="top" top_pad="20" text_color="white"> -Parcel environmental settings are -disabled on legacy regions. +No Parcel parcel is selected. Environmental +settings are disabled. </text> </layout_panel> <layout_panel diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml index 05bd3c336a..b97dfcd0fe 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_density.xml @@ -1,32 +1,262 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - border="true" - follows="all" - label="Density" - name="panel_settings_sky_density" - layout="topleft" - left="0" - top="0" - width="320" - height="240"> -<tab_container> - <panel> - name="panel_settings_sky_density_rayleigh" - <densityctrl> - name = "density_rayleigh" - </densityctrl> - </panel> - <panel> - name="panel_settings_sky_density_mie" - <densityctrl> - name = "density_mie" - </densityctrl> - </panel> - <panel> - name="panel_settings_sky_density_absorption" - <densityctrl> - name = "density_absorption" - </densityctrl> - </panel> -</tab_container> -</panel> + border="true" + follows="all" + label="Density" + layout="topleft" + left="0" + help_topic="sky_density" + name="panel_settings_sky_density" + top="0"> + <layout_stack + follows="all" + layout="topleft" + left="5" + top="5" + right="-5" + bottom="-5" + orientation="vertical"> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="true" + visible="true" + height="28"> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="rayleigh_exponential" + label="Rayleigh Exponential Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="rayleigh_exponential_scale" + label="Rayleigh Exponential Scale:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="rayleigh_linear" + label="Rayleigh Linear Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="rayleigh_constant" + label="Rayleigh Constant Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="true" + visible="true" + height="28"> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="3.0" + name="mie_exponential" + label="Mie Exponential Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="mie_exponential_scale" + label="Mie Exponential Scale:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="3.0" + name="mie_linear" + label="Mie Linear Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="10" + name="mie_constant" + label="Mie Constant Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0.2" + max_val="1.8" + name="mie_aniso_factor" + label="Mie Aniso Factor:" + top_delta="8" + width="400" + can_edit_text="true"/> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="true" + visible="true" + height="28"> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="absorption_exponential" + label="Absorption Exponential Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="absorption_exponential_scale" + label="Absorption Exponential Scale:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="absorption_linear" + label="Absorption Linear Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="0.01" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="0" + max_val="1" + name="absorption_constant" + label="Absorption Constant Term:" + top_delta="8" + width="400" + can_edit_text="true"/> + </layout_panel> + <layout_panel + border="true" + bevel_style="in" + auto_resize="true" + user_resize="true" + visible="true" + height="16"> + <slider + decimal_digits="2" + follows="left|top" + height="16" + increment="1" + initial_value="0" + layout="topleft" + left_delta="5" + min_val="1000" + max_val="40000" + name="max_altitude" + label="Max Altitude:" + top_delta="8" + width="400" + can_edit_text="true"/> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml index 586aff4bb8..4b72bbbe0e 100644 --- a/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml +++ b/indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml @@ -260,7 +260,7 @@ left_delta="5" min_val="0.25" max_val="20" - name="sun_scale" + name="moon_scale" top_delta="15" width="130" can_edit_text="true"/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c0481d1a28..3a882a73d3 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2780,6 +2780,7 @@ If you continue to receive this message, please contact Second Life support for <!-- Environment settings --> <string name="LocalSettings">Local Settings</string> <string name="RegionSettings">Region Settings</string> + <string name="NoEnvironmentSettings">This Region does not support environmental settings.</string> <!-- panel classified --> <string name="ClassifiedClicksTxt">Clicks: [TELEPORT] teleport, [MAP] map, [PROFILE] profile</string> diff --git a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml index 3a9655b317..0e729c821a 100644 --- a/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml +++ b/indra/newview/skins/default/xui/en/widgets/sun_moon_trackball.xml @@ -43,26 +43,26 @@ <sun_moon_trackball.button_rotate_top name="btn_rotate_top" image_unselected="VirtualTrackball_Rotate_Top" - image_selected="VirtualTrackball_Rotate_Top" - image_disabled="VirtualTrackball_Rotate_Top" /> + image_selected="VirtualTrackball_Rotate_Top_Active" + image_disabled="Blank" /> <sun_moon_trackball.button_rotate_bottom name="btn_rotate_bottom" image_unselected="VirtualTrackball_Rotate_Bottom" - image_selected="VirtualTrackball_Rotate_Bottom" - image_disabled="VirtualTrackball_Rotate_Bottom" /> + image_selected="VirtualTrackball_Rotate_Bottom_Active" + image_disabled="Blank" /> <sun_moon_trackball.button_rotate_left name="btn_rotate_left" image_unselected="VirtualTrackball_Rotate_Left" - image_selected="VirtualTrackball_Rotate_Left" - image_disabled="VirtualTrackball_Rotate_Left" /> + image_selected="VirtualTrackball_Rotate_Left_Active" + image_disabled="Blank" /> <sun_moon_trackball.button_rotate_right name="btn_rotate_right" image_unselected="VirtualTrackball_Rotate_Right" - image_selected="VirtualTrackball_Rotate_Right" - image_disabled="VirtualTrackball_Rotate_Right" /> + image_selected="VirtualTrackball_Rotate_Right_Active" + image_disabled="Blank" /> </sun_moon_trackball> |