diff options
Diffstat (limited to 'indra/newview/skins')
10 files changed, 247 insertions, 279 deletions
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 93c9cb02cb..fcab966dee 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -724,9 +724,6 @@ with the same filename but different name <texture name="icon_for_sale.tga" file_name="icons/Icon_For_Sale.png" /> <texture name="icon_top_pick.tga" /> - <texture name="inv_folder_mesh.tga"/> - <texture name="inv_item_mesh.tga"/> - <texture name="lag_status_critical.tga" /> <texture name="lag_status_good.tga" /> <texture name="lag_status_warning.tga" /> diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml index d8b085063f..2152a9f6e9 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -42,58 +42,55 @@ <floater.string name="multiple_participants_added" value="[NAME] were invited to the conversation."/> - <floater.string + <floater.string name="tooltip_to_separate_window" value="Move this conversation to a separate window"/> - <floater.string + <floater.string name="tooltip_to_main_window" value="Move this conversation back to main window"/> - <floater.string + <floater.string name="start_call_button_tooltip" value="Open voice connection"/> - <floater.string + <floater.string name="end_call_button_tooltip" value="Close voice connection"/> - <floater.string + <floater.string name="expcol_button_not_tearoff_tooltip" value="Collapse this pane"/> - <floater.string + <floater.string name="expcol_button_tearoff_and_expanded_tooltip" value="Collapse participant list"/> - <floater.string + <floater.string name="expcol_button_tearoff_and_collapsed_tooltip" value="Expand participant list"/> <view - follows="all" - layout="topleft" - name="contents_view" - top="0" - left="0" - height="355" - width="394"> - <layout_stack - animate="false" - default_tab_group="2" - follows="all" - height="355" - width="394" - layout="topleft" - orientation="vertical" - name="main_stack" - tab_group="1" - top="0" - left="0"> - - <layout_panel - follows="left|top|right" - layout="topleft" - name="toolbar_panel" + follows="all" + layout="topleft" + name="contents_view" + top="0" + left="0" + right="-1" + bottom="-3"> + <layout_stack + animate="false" + default_tab_group="2" + follows="all" + right="-5" + bottom="-1" top="0" - left="0" - height="35" - min_height="35" - width="394"> - <menu_button + left="5" + border_size="0" + layout="topleft" + orientation="vertical" + name="main_stack" + tab_group="1"> + <layout_panel + auto_resize="false" + name="toolbar_panel" + height="35" + right="-1" + left="1"> + <menu_button menu_filename="menu_im_session_showmodes.xml" follows="top|left" height="25" @@ -107,22 +104,22 @@ tool_tip="View/sort options" top="5" width="31" /> - <menu_button - menu_filename="menu_im_conversation.xml" - follows="top|left" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="OptionsMenu_Off" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - layout="topleft" - top="5" - left_pad="2" - name="gear_btn" - visible="false" - tool_tip="Actions on selected person" - width="31"/> - <button + <menu_button + menu_filename="menu_im_conversation.xml" + follows="top|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + layout="topleft" + top="5" + left_pad="2" + name="gear_btn" + visible="false" + tool_tip="Actions on selected person" + width="31"/> + <button enabled="false" follows="top|left" height="25" @@ -136,7 +133,7 @@ name="add_btn" tool_tip="Add someone to this conversation" width="31"/> - <button + <button follows="top|left" height="25" image_hover_unselected="Toolbar_Middle_Over" @@ -149,19 +146,19 @@ name="voice_call_btn" tool_tip="Open voice connection" width="31"/> - <output_monitor - auto_update="true" - follows="top|left" - draw_border="false" - height="16" - layout="topleft" - top="10" - left_pad="10" - mouse_opaque="true" - name="speaking_indicator" - visible="false" - width="20" /> - <button + <output_monitor + auto_update="true" + follows="top|left" + draw_border="false" + height="16" + layout="topleft" + top="10" + left_pad="10" + mouse_opaque="true" + name="speaking_indicator" + visible="false" + width="20" /> + <button follows="right|top" height="25" image_hover_unselected="Toolbar_Middle_Over" @@ -170,232 +167,170 @@ image_unselected="Toolbar_Middle_Off" layout="topleft" top="5" - left="292" + right="-67" name="close_btn" tool_tip="End this conversation" width="31" /> - <button + <button follows="right|top" height="25" image_hover_unselected="Toolbar_Middle_Over" image_overlay="Conv_toolbar_collapse" image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" + image_unselected="Toolbar_Middle_Off" layout="topleft" top="5" left_pad="2" name="expand_collapse_btn" tool_tip="Collapse/Expand this pane" width="31" /> - <button + <button follows="right|top" height="25" image_hover_unselected="Toolbar_Middle_Over" image_overlay="Conv_toolbar_arrow_ne" image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" + image_unselected="Toolbar_Middle_Off" layout="topleft" - top="5" left_pad="2" name="tear_off_btn" + top="5" width="31" /> - </layout_panel> - <layout_panel - name="body_panel" - follows="all" - width="394" - height="235" - user_resize="false" - auto_resize="true"> - <layout_stack - animate="true" - default_tab_group="2" - follows="all" - height="275" - width="394" - layout="topleft" - orientation="horizontal" - name="im_panels" - tab_group="1" - top_pad="0" - left="0"> - <layout_panel - name="speakers_list_panel" - follows="all" - expanded_min_dim="115" - min_dim="0" - width="150" - height="275" - user_resize="true" - auto_resize="false"> - </layout_panel> - <layout_panel - default_tab_group="3" - left="0" - tab_group="2" - follows="all" - top="0" - height="275" - width="244" - layout="topleft" - user_resize="true" - auto_resize="true" - visible="true" - name="right_part_holder" - min_width="221"> - <panel - name="trnsAndChat_panel" - follows="all" - layout="topleft" - visible="true" - height="240" - width="244"> - <layout_stack - animate="true" - default_tab_group="2" - follows="all" - height="240" - width="244" - layout="topleft" - visible="true" - orientation="vertical" - name="translate_and_chat_stack" - tab_group="1" - left_pad="0" - top="0" - left="0"> - <layout_panel - auto_resize="false" - user_resize="false" - height="26" - layout="topleft" - left_delta="0" - name="translate_chat_checkbox_lp" - top_delta="0" - visible="true" - width="210"> - <check_box - top="10" - control_name="TranslateChat" - enabled="true" - height="16" - label="Translate chat" - layout="topleft" - left="5" - name="translate_chat_checkbox" - width="230" /> </layout_panel> <layout_panel - width="210" - layout="topleft" - follows="all" - left_delta="0" - top_delta="0" - bottom="0" - visible="true" - user_resize="false" - auto_resize="true" - name="chat_holder"> - <chat_history - font="SansSerifSmall" - follows="all" - visible="true" - name="chat_history" - parse_highlights="true" - parse_urls="true" - layout="topleft" - right="-5" - left="5" - top="0" - bottom="1"> - </chat_history> + name="body_panel" + top="1" + bottom="-1"> + <layout_stack + default_tab_group="2" + follows="all" + orientation="horizontal" + name="im_panels" + tab_group="1" + top="0" + right="-1" + bottom="-1" + left="0"> + <layout_panel + name="speakers_list_panel" + expanded_min_dim="115" + min_dim="0" + width="150" + user_resize="true" + auto_resize="false" + bottom="-1" /> + <layout_panel + default_tab_group="3" + tab_group="2" + name="right_part_holder" + min_width="221" + bottom="-1"> + <layout_stack + animate="true" + default_tab_group="2" + follows="all" + orientation="vertical" + name="translate_and_chat_stack" + tab_group="1" + top="0" + left="0" + right="-1" + bottom="-1"> + <layout_panel + auto_resize="false" + height="26" + name="translate_chat_checkbox_lp"> + <check_box + top="10" + control_name="TranslateChat" + enabled="true" + height="16" + label="Translate chat" + left="5" + name="translate_chat_checkbox" + width="230" /> + </layout_panel> + <layout_panel + name="chat_holder"> + <chat_history + font="SansSerifSmall" + follows="all" + name="chat_history" + parse_highlights="true" + parse_urls="true" + right="-1" + left="5" + top="0" + bottom="-1" /> + </layout_panel> + </layout_stack> + </layout_panel> + </layout_stack> </layout_panel> - </layout_stack> - </panel> - </layout_panel> - </layout_stack> - </layout_panel> - <layout_panel - height="35" - layout="topleft" - follows="left|right|bottom" - left_delta="0" - right="0" + <layout_panel top_delta="0" - bottom="0" - visible="true" - user_resize="false" + top="0" + height="26" + bottom="-1" auto_resize="false" name="chat_layout_panel"> - <layout_stack - animate="true" - default_tab_group="2" - follows="all" - height="35" - right="0" - layout="topleft" - orientation="horizontal" - name="input_panels" - top_pad="0" - left="0"> - <layout_panel - height="35" - layout="topleft" - follows="left|right|bottom" - left_delta="0" - top_delta="0" - bottom="0" - visible="true" - user_resize="false" - auto_resize="true" - name="input_editor_layout_panel"> - <chat_editor - expand_lines_count="5" - follows="left|right|bottom" - font="SansSerifSmall" - visible="true" - height="20" - is_expandable="true" - label="To" - text_tentative_color="TextFgTentativeColor" - layout="topleft" - name="chat_editor" - max_length="1023" - spellcheck="true" - tab_group="3" - width="160" - top="6" - left="5" - right="-5" - wrap="true"> - </chat_editor> + <layout_stack + animate="false" + default_tab_group="2" + follows="all" + orientation="horizontal" + name="input_panels" + top="0" + bottom="-2" + left="0" + right="-1"> + <layout_panel + name="input_editor_layout_panel" + auto_resize="true" + user_resize="false" + top="0" + bottom="-1"> + <chat_editor + layout="topleft" + expand_lines_count="5" + follows="left|right|bottom" + font="SansSerifSmall" + height="20" + is_expandable="true" + text_tentative_color="TextFgTentativeColor" + name="chat_editor" + max_length="1023" + spellcheck="true" + tab_group="3" + top="1" + bottom="-2" + left="4" + right="-4" + wrap="true" /> + </layout_panel> + <layout_panel + auto_resize="false" + user_resize="false" + name="input_button_layout_panel" + width="30" + top="0" + bottom="-1"> + <button + layout="topleft" + left="1" + right="-1" + top="1" + height="22" + follows="left|right|top" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Conv_expand_one_line" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + name="minz_btn" + tool_tip="Shows/hides message panel" /> + </layout_panel> + </layout_stack> </layout_panel> - <layout_panel - height="35" - layout="topleft" - follows="left|right|bottom" - left_delta="0" - top_delta="0" - bottom="0" - width="35" - visible="true" - user_resize="false" - auto_resize="false" - name="input_button_layout_panel"> - <button - follows="left|right|bottom" - height="25" - image_hover_unselected="Toolbar_Middle_Over" - image_overlay="Conv_expand_one_line" - image_selected="Toolbar_Middle_Selected" - image_unselected="Toolbar_Middle_Off" - layout="topleft" - name="minz_btn" - tool_tip="Shows/hides message panel" - width="28"/> - </layout_panel> - </layout_stack> - </layout_panel> - </layout_stack> + </layout_stack> </view> </floater> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_other.xml b/indra/newview/skins/default/xui/en/menu_attachment_other.xml index 00d4b1dab1..a8012656c2 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_other.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_other.xml @@ -79,6 +79,14 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_call label="Zoom In" name="Zoom In"> diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml index 73c9e8a9d8..500a5dc6d1 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -123,6 +123,14 @@ name="Edit Outfit"> <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call diff --git a/indra/newview/skins/default/xui/en/menu_avatar_other.xml b/indra/newview/skins/default/xui/en/menu_avatar_other.xml index 73fa086f28..bca9ba5a56 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_other.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_other.xml @@ -79,6 +79,14 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_call label="Zoom In" name="Zoom In"> diff --git a/indra/newview/skins/default/xui/en/menu_avatar_self.xml b/indra/newview/skins/default/xui/en/menu_avatar_self.xml index ed35e5e771..362dca698f 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -261,6 +261,14 @@ <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> + <menu_item_call + label="Dump XML" + name="Dump XML"> + <menu_item_call.on_click + function="Advanced.AppearanceToXML" /> + <menu_item_call.on_visible + function="Advanced.EnableAppearanceToXML"/> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call @@ -269,6 +277,7 @@ name="Mute Particle"> <menu_item_call.on_click function="Particle.Mute" /> + <menu_item_call.on_enable function="EnableMuteParticle" /> </menu_item_call> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 101e104eab..52c4fb1613 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -180,7 +180,8 @@ name="Set Logging Level" tear_off="true"> <menu_item_check - label="Debug"> + name="Debug" + label="Debug"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="0" /> @@ -189,7 +190,8 @@ parameter="0" /> </menu_item_check> <menu_item_check - label="Info"> + name="Info" + label="Info"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="1" /> @@ -198,7 +200,8 @@ parameter="1" /> </menu_item_check> <menu_item_check - label="Warning"> + name="Warning" + label="Warning"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="2" /> @@ -207,7 +210,8 @@ parameter="2" /> </menu_item_check> <menu_item_check - label="Error"> + name="Error" + label="Error"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="3" /> @@ -216,7 +220,8 @@ parameter="3" /> </menu_item_check> <menu_item_check - label="None"> + name="None" + label="None"> <menu_item_check.on_check function="Develop.CheckLoggingLevel" parameter="4" /> diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 544f06ac0c..a11cd13fdb 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -131,6 +131,7 @@ name="Status" tear_off="true"> <menu_item_check + name="Away" label="Away"> <menu_item_check.on_check function="View.Status.CheckAway" /> @@ -138,6 +139,7 @@ function="World.SetAway" /> </menu_item_check> <menu_item_check + name="Do Not Disturb" label="Do Not Disturb"> <menu_item_check.on_check function="View.Status.CheckDoNotDisturb" /> @@ -257,6 +259,7 @@ parameter="speak" /> </menu_item_check> <menu_item_check + name="Conversation Log..." label="Conversation Log..."> <menu_item_check.on_check function="Floater.Visible" @@ -352,6 +355,7 @@ </menu_item_call> <menu_item_separator/> <menu_item_check + name="Do Not Disturb" label="Do Not Disturb"> <menu_item_check.on_check function="View.Status.CheckDoNotDisturb" /> @@ -3051,13 +3055,6 @@ <menu_item_call.on_click function="Advanced.PrintAgentInfo" /> </menu_item_call> - <menu_item_call - label="Memory Stats" - name="Memory Stats" - shortcut="control|alt|shift|M"> - <menu_item_call.on_click - function="Advanced.PrintTextureMemoryStats" /> - </menu_item_call> <menu_item_check label="Region Debug Console" name="Region Debug Console" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7aed51f2ce..a627596a15 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -352,7 +352,7 @@ Save all changes to clothing/body parts? icon="alertmodal.tga" name="FriendsAndGroupsOnly" type="alertmodal"> - Non-friends won't know that you've choosen to ignore their calls and instant messages. + Non-friends won't know that you've chosen to ignore their calls and instant messages. <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 3b1cbf6a58..f4473dd0b1 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2989,6 +2989,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="Higher">Higher</string> <string name="Hip Length">Hip Length</string> <string name="Hip Width">Hip Width</string> +<string name="Hover">Hover</string> <string name="In">In</string> <string name="In Shdw Color">Inner Shadow Color</string> <string name="In Shdw Opacity">Inner Shadow Opacity</string> |