diff options
Diffstat (limited to 'indra/newview/skins')
10 files changed, 86 insertions, 135 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index be68c2873e..4462fb792f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -125,27 +125,29 @@ with the same filename but different name <texture name="Checkbox_Press" file_name="widgets/Checkbox_Press.png" preload="true" /> <texture name="Check_Mark" file_name="icons/check_mark" preload="true" /> - <texture name="Command_Avatar_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Build_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Chat_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Compass_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Gestures_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_HowTo_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Landmarks_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Map_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MiniMap_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Move_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MyLand_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_MyStuff_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_People_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Places_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Search_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Settings_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Shop_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Snapshot_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Speak_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_Upload_Icon" file_name="icons/SL_Logo.png" preload="true" /> - <texture name="Command_View_Icon" file_name="icons/SL_Logo.png" preload="true" /> + <texture name="Command_AboutLand_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Appearance_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Avatar_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Build_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Chat_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Compass_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Destinations_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Gestures_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_HowTo_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Inventory_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Map_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Marketplace_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_MiniMap_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Move_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_People_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Places_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Preferences_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Profile_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Search_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Snapshot_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Speak_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_View_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> + <texture name="Command_Voice_Icon" file_name="taskpanel/TabIcon_Home_Off.png" preload="true" /> <texture name="ComboButton_Disabled" file_name="widgets/ComboButton_Disabled.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> <texture name="ComboButton_Selected" file_name="widgets/ComboButton_Selected.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" /> @@ -760,26 +762,4 @@ with the same filename but different name <texture name="Popup_Caution" file_name="icons/pop_up_caution.png"/> <texture name="Camera_Drag_Dot" file_name="world/CameraDragDot.png"/> - <texture name="Command_Avatar_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Build_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Chat_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Compass_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Gestures_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_HowTo_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Landmarks_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Map_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_MiniMap_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Move_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_MyLand_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_MyStuff_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_People_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Places_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Search_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Settings_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Shop_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Snapshot_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Speak_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_Upload_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - <texture name="Command_View_Icon" file_name="taskpanel/TabIcon_Home_Off.png"/> - </textures> diff --git a/indra/newview/skins/default/xui/en/floater_people.xml b/indra/newview/skins/default/xui/en/floater_people.xml index 13e0738e52..4dd3a2f0e1 100644 --- a/indra/newview/skins/default/xui/en/floater_people.xml +++ b/indra/newview/skins/default/xui/en/floater_people.xml @@ -1,21 +1,23 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> + <floater - can_close="true" - can_resize="true" - height="570" - help_topic="sidebar_people" - min_width="333" - min_height="440" - name="floater_people" - save_rect="true" - save_visibility="true" - title="People" - width="333" > + can_close="true" + can_resize="true" + height="570" + help_topic="sidebar_people" + min_height="440" + min_width="333" + layout="topleft" + name="floater_people" + save_rect="true" + single_instance="true" + title="PEOPLE" + width="333"> <panel_container + default_panel_name="panel_people" follows="all" height="570" name="main_panel" - default_panel_name="panel_people" width="333"> <panel class="panel_people" diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 6ece01b2ba..d8f593715f 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -90,14 +90,6 @@ top="0" visible="false" width="1024"/> - <panel follows="right|top|bottom" - height="500" - mouse_opaque="false" - name="side_bar_tabs" - right="500" - tab_stop="false" - top="0" - width="32"/> <panel bottom="500" follows="left|right|bottom" height="25" @@ -116,17 +108,6 @@ visible="false"/> </layout_stack> </layout_panel> - <!-- side tray --> - <layout_panel auto_resize="false" - follows="top|bottom" - height="500" - min_width="333" - mouse_opaque="false" - tab_stop="false" - name="side_tray_container" - user_resize="false" - visible="false" - width="333"/> </layout_stack> <panel top="0" follows="all" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index bb58dd500f..80e310a873 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -93,14 +93,6 @@ parameter="ui_preview" /> </menu_item_call> <menu_item_separator /> - <!-- Broken - <menu_item_call - label="Show Side Tray" - name="Show Side Tray"> - <menu_item_call.on_click - function="Advanced.ShowSideTray" /> - </menu_item_call> - --> <menu create_jump_keys="true" label="UI Tests" diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml index 29eeb93ac1..b452f96e7a 100644 --- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml @@ -42,6 +42,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Friends.ViewSort.Action" parameter="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml index 65bd2793b6..614dd693c5 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml @@ -52,6 +52,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml index 0634e3bd3b..485a5a658c 100644 --- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml @@ -34,6 +34,6 @@ </menu_item_check> <menu_item_separator layout="topleft" /> <menu_item_call name="show_blocked_list" label="Show Blocked Residents & Objects"> - <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" /> + <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="panel_block_list_sidetray" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_toolbars.xml b/indra/newview/skins/default/xui/en/menu_toolbars.xml index de13fec670..59912b5503 100644 --- a/indra/newview/skins/default/xui/en/menu_toolbars.xml +++ b/indra/newview/skins/default/xui/en/menu_toolbars.xml @@ -12,11 +12,11 @@ <menu_item_separator layout="topleft" /> <menu_item_check label="Icons and labels" layout="topleft" - name="icons_and_labels"> + name="icons_with_text"> <on_click function="Toolbars.EnableSetting" - parameter="icons_and_labels" /> + parameter="icons_with_text" /> <on_check function="Toolbars.CheckSetting" - parameter="icons_and_labels" /> + parameter="icons_with_text" /> </menu_item_check> <menu_item_check label="Icons only" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_move.xml b/indra/newview/skins/default/xui/en/panel_preferences_move.xml index 1a8aae7f91..c131649fc8 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_move.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_move.xml @@ -86,16 +86,6 @@ name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode" width="242" /> - <check_box - control_name="SidebarCameraMovement" - follows="left|top" - height="16" - initial_value="true" - label="Sidebar" - layout="topleft" - name="appearance_sidebar_positioning" - tool_tip="Use automatic camera positioning for sidebar" - width="242" /> <icon follows="left|top" height="18" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index feea555fdc..158e1c711d 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -16,16 +16,16 @@ <string name="StartupDetectingHardware">Detecting hardware...</string> <string name="StartupLoading">Loading [APP_NAME]...</string> <string name="StartupClearingCache">Clearing cache...</string> - <string name="StartupInitializingTextureCache">Initializing Texture Cache...</string> + <string name="StartupInitializingTextureCache">Initializing texture cache...</string> <string name="StartupInitializingVFS">Initializing VFS...</string> - <string name="StartupRequireDriverUpdate">Graphics Initialization Failed. Please Update Your Graphics Driver!</string> + <string name="StartupRequireDriverUpdate">Graphics initialization failed. Please update your graphics driver!</string> <!-- progress --> <string name="ProgressRestoring">Restoring...</string> - <string name="ProgressChangingResolution">Changing Resolution...</string> + <string name="ProgressChangingResolution">Changing resolution...</string> <!-- Legacy strings, almost never used --> - <string name="Fullbright">Fullbright (Legacy)</string> <!-- used in the Build > materials dropdown--> + <string name="Fullbright">Fullbright (legacy)</string> <!-- used in the Build > materials dropdown--> <!-- Login --> <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen. Please wait.</string> @@ -38,8 +38,8 @@ <string name="LoginInitializingMultimedia">Initializing multimedia...</string> <string name="LoginInitializingFonts">Loading fonts...</string> <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string> - <string name="LoginProcessingResponse">Processing Response...</string> - <string name="LoginInitializingWorld">Initializing World...</string> + <string name="LoginProcessingResponse">Processing response...</string> + <string name="LoginInitializingWorld">Initializing world...</string> <string name="LoginDecodingImages">Decoding images...</string> <string name="LoginInitializingQuicktime">Initializing QuickTime...</string> <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string> @@ -56,7 +56,7 @@ <string name="CertBasicConstraints">Too many certificates were in the servers Certificate chain. Please contact your Grid administrator.</string> <string name="CertInvalidSignature">The certificate signature returned by the Grid server could not be verified. Please contact your Grid administrator.</string> - <string name="LoginFailedNoNetwork">Network Error: Could not establish connection, please check your network connection.</string> + <string name="LoginFailedNoNetwork">Network error: Could not establish connection, please check your network connection.</string> <string name="LoginFailed">Login failed.</string> <string name="Quit">Quit</string> <string name="create_account_url">http://join.secondlife.com/</string> @@ -3652,47 +3652,53 @@ Try enclosing path to the editor with double quotes. <string name="ParticleHiding">Hiding Particles</string> <!-- commands --> + + <string name="Command_AboutLand_Label">About land</string> + <string name="Command_Appearance_Label">Appearance</string> <string name="Command_Avatar_Label">Avatar</string> - <string name="Command_Avatar_Tooltip">Change the appearance of your avatar</string> <string name="Command_Build_Label">Build</string> - <string name="Command_Build_Tooltip">Building, reshaping terrain</string> <string name="Command_Chat_Label">Chat</string> - <string name="Command_Chat_Tooltip">Chat with people nearby</string> <string name="Command_Compass_Label">Compass</string> - <string name="Command_Compass_Tooltip"></string> + <string name="Command_Destinations_Label">Destinations</string> <string name="Command_Gestures_Label">Gestures</string> - <string name="Command_Gestures_Tooltip"></string> - <string name="Command_HowTo_Label">How To</string> - <string name="Command_HowTo_Tooltip"></string> - <string name="Command_Landmarks_Label">Landmarks</string> - <string name="Command_Landmarks_Tooltip"></string> + <string name="Command_HowTo_Label">How to</string> + <string name="Command_Inventory_Label">Inventory</string> <string name="Command_Map_Label">Map</string> - <string name="Command_Map_Tooltip"></string> - <string name="Command_MiniMap_Label">Mini Map</string> - <string name="Command_MiniMap_Tooltip"></string> + <string name="Command_Marketplace_Label">Marketplace</string> + <string name="Command_MiniMap_Label">Mini-map</string> <string name="Command_Move_Label">Move</string> - <string name="Command_Move_Tooltip"></string> - <string name="Command_MyLand_Label">My Land</string> - <string name="Command_MyLand_Tooltip">Information about the land you're visiting</string> - <string name="Command_MyStuff_Label">My Stuff</string> - <string name="Command_MyStuff_Tooltip">View and use your belongings</string> <string name="Command_People_Label">People</string> - <string name="Command_People_Tooltip"></string> <string name="Command_Places_Label">Places</string> - <string name="Command_Places_Tooltip">Destination guide</string> + <string name="Command_Preferences_Label">Preferences</string> + <string name="Command_Profile_Label">Profile</string> <string name="Command_Search_Label">Search</string> - <string name="Command_Search_Tooltip">Find...</string> - <string name="Command_Settings_Label">Settings</string> - <string name="Command_Settings_Tooltip">Preferences</string> - <string name="Command_Shop_Label">Shop</string> - <string name="Command_Shop_Tooltip"></string> <string name="Command_Snapshot_Label">Snapshot</string> - <string name="Command_Snapshot_Tooltip">Take a picture</string> <string name="Command_Speak_Label">Speak</string> - <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> - <string name="Command_Upload_Label">Upload</string> - <string name="Command_Upload_Tooltip"></string> <string name="Command_View_Label">View</string> - <string name="Command_View_Tooltip">Changing your view of the world</string> + <string name="Command_Voice_Label">Nearby voice</string> + + <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string> + <string name="Command_Appearance_Tooltip">Change your avatar</string> + <string name="Command_Avatar_Tooltip">Choose a complete avatar</string> + <string name="Command_Build_Tooltip">Building objects and reshaping them</string> + <string name="Command_Chat_Tooltip">Chat with people nearby using text</string> + <string name="Command_Compass_Tooltip">Compass</string> + <string name="Command_Destinations_Tooltip">Destinations of interest</string> + <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> + <string name="Command_HowTo_Tooltip">How to do common tasks</string> + <string name="Command_Inventory_Tooltip">View and use your belongings</string> + <string name="Command_Map_Tooltip">Map of the world</string> + <string name="Command_Marketplace_Tooltip">Go shopping</string> + <string name="Command_MiniMap_Tooltip">Show nearby people</string> + <string name="Command_Move_Tooltip">Moving your avatar</string> + <string name="Command_People_Tooltip">Friends, groups, and nearby people</string> + <string name="Command_Places_Tooltip">Places you've saved</string> + <string name="Command_Preferences_Tooltip">Preferences</string> + <string name="Command_Profile_Tooltip">Edit or view your profile</string> + <string name="Command_Search_Tooltip">Find places, events, people</string> + <string name="Command_Snapshot_Tooltip">Take a picture</string> + <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string> + <string name="Command_View_Tooltip">Changing camera angle</string> + <string name="Command_Voice_Tooltip">People nearby with voice capability</string> </strings> |