diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 53 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml index 1b4992b4ca..7142fea0ea 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml @@ -2,7 +2,7 @@ <floater legacy_header_height="18" can_minimize="false" - height="468" + height="488" layout="topleft" name="Inventory Finder" help_topic="inventory_finder" @@ -212,6 +212,23 @@ name="check_snapshot" top_delta="0" width="126" /> + <icon + height="16" + image_name="Inv_Settings" + layout="topleft" + left="8" + mouse_opaque="true" + name="icon_settings" + top="262" + width="16" /> + <check_box + height="16" + label="Settings" + layout="topleft" + left_pad="2" + name="check_settings" + top_delta="0" + width="126" /> <button follows="left|top" height="20" @@ -220,7 +237,7 @@ layout="topleft" left="8" name="All" - top="262" + top="282" width="100" /> <button height="20" @@ -274,7 +291,7 @@ width="260"/> <check_box height="16" - top="352" + top="372" label="Since Logoff" layout="topleft" left_delta="0" @@ -290,7 +307,7 @@ layout="topleft" left_delta="0" name="- OR -" - top="370" + top="390" width="144"> - OR - </text> @@ -298,7 +315,7 @@ height="16" layout="topleft" name="date_search_direction" - top="388" + top="408" left="8" width="270"> <radio_item @@ -368,6 +385,6 @@ layout="topleft" name="Close" right="-6" - top="434" + top="454" width="76" /> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index d4881d3cba..b7a6cb9287 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -643,17 +643,6 @@ name="Environment" tear_off="true"> <menu_item_check - label="Pause Clouds" - name="pauseclouds"> - <menu_item_check.on_click - function="World.EnvSettings" - parameter="pauseclouds" /> - <menu_item_check.on_check - function="World.EnableEnvSettings" - parameter="pauseclouds" /> - </menu_item_check> - <menu_item_separator/> - <menu_item_check label="Sunrise" name="Sunrise"> <menu_item_check.on_click @@ -695,7 +684,6 @@ function="World.EnableEnvSettings" parameter="midnight" /> </menu_item_check> - <menu_item_separator/> <menu_item_check label="Use Region Settings" name="Use Region Settings"> @@ -706,6 +694,26 @@ function="World.EnableEnvSettings" parameter="region" /> </menu_item_check> + <menu_item_separator/> + <menu_item + label="My Environments..." + name="My Environments"> + <menu_item_check.on_click + function="World.MyEnvirons" + parameter="my_environs" /> + </menu_item> + <menu_item_separator/> + <menu_item_check + label="Pause Clouds" + name="pauseclouds"> + <menu_item_check.on_click + function="World.EnvSettings" + parameter="pauseclouds" /> + <menu_item_check.on_check + function="World.EnableEnvSettings" + parameter="pauseclouds" /> + </menu_item_check> + </menu> <!-- diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index fcabf1059e..eb4f658495 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -11101,7 +11101,7 @@ Cannot create large prims that intersect other residents. Please re-try when ot name="FailedToFindSettings" persist="true" type="alertmodal"> -Failed to find the settings named [DESC] in database. +Could not load the settings for [NAME] from the database. <tag>fail</tag> </notification> @@ -11131,5 +11131,14 @@ Unable to apply those settings to the environment. This Region does not support environmental settings. <tag>fail</tag> </notification> + + <notification + icon="notify.tga" + name="WLImportFail" + persist="true" + type="alertmodal"> +Unable to import legacy Windlight settings from [FILE]. + <tag>fail</tag> + </notification> </notifications> |