diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-10-06 16:42:19 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-06 16:42:19 -0700 |
commit | 4eecfd4faeb253ad34258ccbe8e4c206d9d2c478 (patch) | |
tree | 5ecc314480e4c15d391b17dcd2733eb628c7eee9 /indra/newview | |
parent | 63b357758ea83dce34d8bc3e2f8ee7246b5aced5 (diff) |
Updated FUI toolbar buttons and corresponding floaters including:
* About land
* Appearance
* Gestures
* Inventory
* Map
* Nearby voice
* Snapshot
Diffstat (limited to 'indra/newview')
9 files changed, 22 insertions, 21 deletions
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 1fff95417b..8ee4b7d075 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -96,9 +96,9 @@ label_ref="Command_Inventory_Label" tooltip_ref="Command_Inventory_Tooltip" execute_function="Floater.ToolbarToggle" - execute_parameters="inventory" + execute_parameters="my_inventory" is_running_function="Floater.IsOpen" - is_running_parameters="inventory" + is_running_parameters="my_inventory" /> <command name="map" available_in_toybox="true" diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index e5dcc9bcb5..9cd838318c 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -6,7 +6,7 @@ name="floaterland" help_topic="floaterland" save_rect="true" - title="ABOUT LAND" + title="About land" width="490"> <floater.string name="maturity_icon_general"> diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml index 9f5e6828d2..c0424f4de3 100644 --- a/indra/newview/skins/default/xui/en/floater_gesture.xml +++ b/indra/newview/skins/default/xui/en/floater_gesture.xml @@ -5,7 +5,7 @@ height="465" name="gestures" help_topic="gestures" - title="GESTURES" + title="Gestures" background_visible="true" follows="all" label="Places" diff --git a/indra/newview/skins/default/xui/en/floater_my_appearance.xml b/indra/newview/skins/default/xui/en/floater_my_appearance.xml index 8f97887b3f..de2aa49c0c 100644 --- a/indra/newview/skins/default/xui/en/floater_my_appearance.xml +++ b/indra/newview/skins/default/xui/en/floater_my_appearance.xml @@ -6,9 +6,10 @@ height="588" layout="topleft" name="floater_my_appearance" + help_topic="appearance" save_rect="true" single_instance="true" - title="MY APPEARANCE" + title="Appearance" width="333"> <panel top="18" diff --git a/indra/newview/skins/default/xui/en/floater_my_inventory.xml b/indra/newview/skins/default/xui/en/floater_my_inventory.xml index fd03a5324e..3f852c9ed5 100644 --- a/indra/newview/skins/default/xui/en/floater_my_inventory.xml +++ b/indra/newview/skins/default/xui/en/floater_my_inventory.xml @@ -9,7 +9,7 @@ name="floater_my_inventory" save_rect="true" save_visibility="true" - title="My Inventory" + title="Inventory" width="333" > <panel class="sidepanel_inventory" diff --git a/indra/newview/skins/default/xui/en/floater_snapshot.xml b/indra/newview/skins/default/xui/en/floater_snapshot.xml index 89a0c4c287..4ba513bf9c 100644 --- a/indra/newview/skins/default/xui/en/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/en/floater_snapshot.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - can_minimize="false" + can_minimize="true" can_close="true" follows="left|top" height="520" @@ -10,7 +10,7 @@ help_topic="snapshot" save_rect="true" save_visibility="true" - title="SNAPSHOT PREVIEW" + title="Snapshot preview" width="245"> <floater.string name="unknown"> diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml index f017a7ace6..447549db44 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -2,14 +2,14 @@ <floater can_resize="true" can_minimize="true" - can_close="false" + can_close="true" height="205" layout="topleft" min_height="124" min_width="190" name="floater_voice_controls" help_topic="floater_voice_controls" - title="Voice Controls" + title="Voice controls" save_dock_state="true" save_visibility="true" save_rect="true" @@ -17,15 +17,15 @@ width="282"> <string name="title_nearby"> - NEARBY VOICE + Nearby voice </string> <string name="title_group"> - Group Call with [GROUP] + Group call with [GROUP] </string> <string name="title_adhoc"> - Conference Call + Conference call </string> <string name="title_peer_2_peer"> diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml index 019e7cd032..3d997a17f7 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -12,7 +12,7 @@ save_rect="true" save_visibility="true" single_instance="true" - title="WORLD MAP" + title="World map" width="650"> <panel filename="panel_world_map.xml" diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 2b5e3143a4..b52784d6bc 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -93,10 +93,10 @@ label="" height="200" width="330"> - <string name="InboxLabelWithArg">Received Items ([NUM])</string> - <string name="InboxLabelNoArg">Received Items</string> + <string name="InboxLabelWithArg">Received items ([NUM])</string> + <string name="InboxLabelNoArg">Received items</string> <button - label="Received Items" + label="Received items" font="SansSerifMedium" name="inbox_btn" height="35" @@ -124,7 +124,7 @@ halign="right" top_pad="0" width="300"> - [NUM] New + [NUM] new </text> <panel follows="all" @@ -175,10 +175,10 @@ label="" height="200" width="330"> - <string name="OutboxLabelWithArg">Merchant Outbox ([NUM])</string> - <string name="OutboxLabelNoArg">Merchant Outbox</string> + <string name="OutboxLabelWithArg">Merchant outbox ([NUM])</string> + <string name="OutboxLabelNoArg">Merchant outbox</string> <button - label="Merchant Outbox" + label="Merchant outbox" font="SansSerifMedium" name="outbox_btn" height="35" |