diff options
Diffstat (limited to 'indra/newview/skins')
28 files changed, 571 insertions, 218 deletions
diff --git a/indra/newview/skins/default/textures/alpha_gradient.tga b/indra/newview/skins/default/textures/alpha_gradient.tga Binary files differnew file mode 100644 index 0000000000..6fdba25d4e --- /dev/null +++ b/indra/newview/skins/default/textures/alpha_gradient.tga diff --git a/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c Binary files differnew file mode 100644 index 0000000000..5de5a80a65 --- /dev/null +++ b/indra/newview/skins/default/textures/alpha_gradient_2d.j2c diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index eca5130426..01976c9a5c 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -54,6 +54,11 @@ <texture name="CameraView_Off" file_name="bottomtray/CameraView_Off.png" preload="false" /> <texture name="CameraView_Over" file_name="bottomtray/CameraView_Over.png" preload="false" /> + <texture name="CameraPreset_Rear" file_name="camera_presets/camera_presets_rear.png" preload="false" /> + <texture name="CameraPreset_3_4" file_name="camera_presets/camera_presets_3_4.png" preload="false" /> + <texture name="CameraPreset_Front" file_name="camera_presets/camera_presets_front.png" preload="false" /> + <texture name="CameraPreset_Mouselook" file_name="camera_presets/camera_presets_mouselook.png" preload="false" /> + <texture name="Checkbox_Off_Disabled" file_name="widgets/Checkbox_Disabled.png" preload="true" /> <texture name="Checkbox_On_Disabled" file_name="widgets/Checkbox_On_Disabled.png" preload="true" /> <texture name="Checkbox_Off" file_name="widgets/Checkbox_Off.png" preload="true" /> diff --git a/indra/newview/skins/default/xui/en/favorites_bar_button.xml b/indra/newview/skins/default/xui/en/favorites_bar_button.xml index 9cd7056866..c35cbb1539 100644 --- a/indra/newview/skins/default/xui/en/favorites_bar_button.xml +++ b/indra/newview/skins/default/xui/en/favorites_bar_button.xml @@ -4,7 +4,7 @@ <button follows="left|bottom" halign="center" - height="23" + height="15" image_disabled="transparent.j2c" image_disabled_selected="transparent.j2c" image_selected="transparent.j2c" diff --git a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml index f6b965f139..e677426ee5 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml @@ -5,7 +5,7 @@ name="avatar_texture_debug" help_topic="avatar_texture_debug" title="Avatar Textures" - width="960"> + width="1250"> <floater.string name="InvalidAvatar"> INVALID AVATAR @@ -41,6 +41,7 @@ name="Dump" top_delta="1" width="150" /> + <texture_picker height="143" label="Hair" @@ -54,11 +55,20 @@ label="Hair" layout="topleft" left_pad="7" - name="hair" + name="hair_grain" top_delta="0" width="128" /> <texture_picker height="143" + label="Hair Alpha" + layout="topleft" + left_pad="7" + name="hair_alpha" + top_delta="0" + width="128" /> + + <texture_picker + height="143" label="Head" layout="topleft" left="10" @@ -70,11 +80,28 @@ label="Makeup" layout="topleft" left_pad="7" - name="head bodypaint" + name="head_bodypaint" + top_delta="0" + width="128" /> + <texture_picker + height="143" + label="Head Alpha" + layout="topleft" + left_pad="7" + name="head_alpha" top_delta="0" width="128" /> <texture_picker height="143" + label="Head Tattoo" + layout="topleft" + left_pad="7" + name="head_tattoo" + top_delta="0" + width="128" /> + + <texture_picker + height="143" label="Eyes" layout="topleft" left="10" @@ -86,9 +113,18 @@ label="Eye" layout="topleft" left_pad="7" - name="iris" + name="eyes_iris" + top_delta="0" + width="128" /> + <texture_picker + height="143" + label="Eyes Alpha" + layout="topleft" + left_pad="7" + name="eyes_alpha" top_delta="0" width="128" /> + <texture_picker height="143" label="Upper Body" @@ -99,10 +135,10 @@ width="128" /> <texture_picker height="143" - label="Upper Body Tattoo" + label="Upper Body Bodypaint" layout="topleft" left_pad="7" - name="upper bodypaint" + name="upper_bodypaint" top_delta="0" width="128" /> <texture_picker @@ -110,7 +146,7 @@ label="Undershirt" layout="topleft" left_pad="7" - name="undershirt" + name="upper_undershirt" top_delta="0" width="128" /> <texture_picker @@ -118,7 +154,7 @@ label="Gloves" layout="topleft" left_pad="7" - name="gloves" + name="upper_gloves" top_delta="0" width="128" /> <texture_picker @@ -126,7 +162,7 @@ label="Shirt" layout="topleft" left_pad="7" - name="shirt" + name="upper_shirt" top_delta="0" width="128" /> <texture_picker @@ -134,11 +170,28 @@ label="Upper Jacket" layout="topleft" left_pad="7" - name="upper jacket" + name="upper_jacket" top_delta="0" width="128" /> <texture_picker height="143" + label="Upper Alpha" + layout="topleft" + left_pad="7" + name="upper_alpha" + top_delta="0" + width="128" /> + <texture_picker + height="143" + label="Upper Tattoo" + layout="topleft" + left_pad="7" + name="upper_tattoo" + top_delta="0" + width="128" /> + + <texture_picker + height="143" label="Lower Body" layout="topleft" left="10" @@ -147,10 +200,10 @@ width="128" /> <texture_picker height="143" - label="Lower Body Tattoo" + label="Lower Body Bodypaint" layout="topleft" left_pad="7" - name="lower bodypaint" + name="lower_bodypaint" top_delta="0" width="128" /> <texture_picker @@ -158,7 +211,7 @@ label="Underpants" layout="topleft" left_pad="7" - name="underpants" + name="lower_underpants" top_delta="0" width="128" /> <texture_picker @@ -166,7 +219,7 @@ label="Socks" layout="topleft" left_pad="7" - name="socks" + name="lower_socks" top_delta="0" width="128" /> <texture_picker @@ -174,7 +227,7 @@ label="Shoes" layout="topleft" left_pad="7" - name="shoes" + name="lower_shoes" top_delta="0" width="128" /> <texture_picker @@ -182,7 +235,7 @@ label="Pants" layout="topleft" left_pad="7" - name="pants" + name="lower_pants" top_delta="0" width="128" /> <texture_picker @@ -190,9 +243,26 @@ label="Jacket" layout="topleft" left_pad="7" - name="lower jacket" + name="lower_jacket" + top_delta="0" + width="128" /> + <texture_picker + height="143" + label="Lower Alpha" + layout="topleft" + left_pad="7" + name="lower_alpha" + top_delta="0" + width="128" /> + <texture_picker + height="143" + label="Lower Tattoo" + layout="topleft" + left_pad="7" + name="lower_tattoo" top_delta="0" width="128" /> + <texture_picker height="143" label="Skirt" @@ -209,4 +279,5 @@ name="skirt" top_delta="0" width="128" /> + </floater> diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml index a5c73a7ca4..520249c2a2 100644 --- a/indra/newview/skins/default/xui/en/floater_camera.xml +++ b/indra/newview/skins/default/xui/en/floater_camera.xml @@ -80,6 +80,75 @@ tool_tip="Zoom camera toward focus" top_delta="0" width="16" /> + <panel + height="70" + layout="topleft" + left="15" + name="camera_presets" + top="15" + visible="false" + width="75"> + <button + height="30" + image_selected="CameraPreset_Rear" + image_unselected="CameraPreset_Rear" + layout="topleft" + left="5" + name="rear_view" + picture_style="true" + tool_tip="Rear View" + top="2" + width="30"> + <click_callback + function="CameraPresets.ChangeView" + parameter="rear_view" /> + </button> + <button + height="30" + image_selected="CameraPreset_3_4" + image_unselected="CameraPreset_3_4" + layout="topleft" + left_pad="5" + name="group_view" + picture_style="true" + tool_tip="Group View" + top="2" + width="30"> + <click_callback + function="CameraPresets.ChangeView" + parameter="group_view" /> + </button> + <button + height="30" + image_selected="CameraPreset_Front" + image_unselected="CameraPreset_Front" + layout="topleft" + left="5" + name="front_view" + picture_style="true" + tool_tip="Front View" + top_pad="2" + width="30"> + <click_callback + function="CameraPresets.ChangeView" + parameter="front_view" /> + </button> + <button + height="30" + image_selected="CameraPreset_Mouselook" + image_unselected="CameraPreset_Mouselook" + layout="topleft" + left_pad="5" + name="mouselook_view" + picture_style="true" + tool_tip="Mouselook View" + top_pad="-30" + width="30"> + <click_callback + function="CameraPresets.ChangeView" + parameter="mouselook_view" /> + </button> + </panel> </panel> <panel border="true" 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 611c51ad11..0037c6ef04 100644 --- a/indra/newview/skins/default/xui/en/floater_im_session.xml +++ b/indra/newview/skins/default/xui/en/floater_im_session.xml @@ -11,7 +11,10 @@ can_dock="true" can_minimize="true" visible="true" - width="365"> + width="365" + can_resize="true" + min_width="200" + min_height="150"> <layout_stack follows="left|top|right|bottom" height="235" width="365" @@ -24,9 +27,9 @@ name="panel_im_control_panel" layout="topleft" top_delta="-3" - min_width="96" width="146" height="225" + follows="left" label="IM Control Panel" user_resize="false" /> <layout_panel height="235" @@ -35,33 +38,30 @@ top="0" user_resize="false"> <button height="12" + follows="left|top" top="8" label="<<" layout="topleft" width="35" name="slide_left_btn" /> <button height="12" + follows="left|top" top="8" label=">>" layout="topleft" width="35" name="slide_right_btn" /> - <text_editor - enabled="false" - type="string" + <chat_history length="1" - follows="left|top|right" + follows="left|top|right|bottom" font="SansSerif" height="185" layout="topleft" - max_length="2147483647" - name="im_text" + name="chat_history" parse_highlights="true" allow_html="true" - track_bottom="true" - width="195" - word_wrap="true"> - </text_editor> + width="195"> + </chat_history> <line_editor follows="left|right" name="chat_editor" height="20" layout="topleft" width="190"> </line_editor> </layout_panel> diff --git a/indra/newview/skins/default/xui/en/floater_media_settings.xml b/indra/newview/skins/default/xui/en/floater_media_settings.xml index 6ba26f938d..b96573b32a 100644 --- a/indra/newview/skins/default/xui/en/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_media_settings.xml @@ -1,20 +1,74 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true" - can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true" - width="365" height="535" left="330" min_height="430" min_width="620" - mouse_opaque="true" name="Medis Settings" title="Media Settings"> - <button bottom="-525" enabled="true" follows="right|bottom" font="SansSerif" - halign="center" height="20" label="OK" label_selected="OK" left="75" - mouse_opaque="true" name="OK" scale_image="true" width="90" /> - <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" - halign="center" height="20" label="Cancel" label_selected="Cancel" - left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true" - width="90" /> - <button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif" - halign="center" height="20" label="Apply" label_selected="Apply" - left_delta="93" mouse_opaque="true" name="Apply" scale_image="true" - width="90" /> - <tab_container bottom="-500" enabled="true" follows="left|top|right|bottom" height="485" - left="0" mouse_opaque="false" name="tab_container" tab_group="1" - tab_position="top" tab_width="80" width="365" /> +<floater + bottom="-666" + can_close="true" + can_drag_on_left="false" + can_minimize="true" + can_resize="false" + can_tear_off="true" + default_tab_group="1" + enabled="true" + width="365" + height="535" + left="330" + min_height="430" + min_width="620" + mouse_opaque="true" + name="Medis Settings" + help_topic = "media_settings" + title="Media Settings"> + <button + bottom="-525" + enabled="true" + follows="right|bottom" + font="SansSerif" + halign="center" + height="20" + label="OK" + label_selected="OK" + left="75" + mouse_opaque="true" + name="OK" + scale_image="true" + width="90" /> + <button + bottom_delta="0" + enabled="true" + follows="right|bottom" + font="SansSerif" + halign="center" + height="20" + label="Cancel" + label_selected="Cancel" + left_delta="93" + mouse_opaque="true" + name="Cancel" + scale_image="true" + width="90" /> + <button + bottom_delta="0" + enabled="true" + follows="right|bottom" + font="SansSerif" + halign="center" + height="20" + label="Apply" + label_selected="Apply" + left_delta="93" + mouse_opaque="true" + name="Apply" + scale_image="true" + width="90" /> + <tab_container + bottom="-500" + enabled="true" + follows="left|top|right|bottom" + height="485" + left="0" + mouse_opaque="false" + name="tab_container" + tab_group="1" + tab_position="top" + tab_width="80" + width="365" /> </floater> diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml index b5a89d53e8..0bd4b441c6 100644 --- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml @@ -1,9 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater - can_dock="true" can_minimize="true" - can_close="true" - center_horiz="true" + can_tear_off="false" + can_resize="false" + can_drag_on_left="false" + can_close="false" + can_dock="true" + bevel_style="in" height="300" layout="topleft" name="nearby_chat" @@ -18,8 +21,8 @@ bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" follows="all" - left="0" - top="15" + left="1" + top="20" font="SansSerif" layout="topleft" height="280" diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml new file mode 100644 index 0000000000..df74d2dcd4 --- /dev/null +++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<context_menu + layout="topleft" + name="Multi-Selected People Context Menu"> + <menu_item_call + enabled="false" + label="Add Friends" + layout="topleft" + name="Add Friends"> + <on_click + function="Avatar.AddFriends" /> + <on_enable + function="Avatar.EnableItem" + parameter="can_add" /> + </menu_item_call> + <menu_item_call + label="IM" + layout="topleft" + name="IM"> + <on_click + function="Avatar.IM" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Call" + layout="topleft" + name="Call"> + <on_click + function="Avatar.Call" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Share" + layout="topleft" + name="Share"> + <on_click + function="Avatar.Share" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Pay" + layout="topleft" + name="Pay"> + <on_click + function="Avatar.Pay" /> + </menu_item_call> +</context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml index 29fb4990d0..c849188699 100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_folder.xml @@ -118,7 +118,7 @@ layout="topleft" name="sort_by_date"> <on_check - function="Places.LandmarksGear.Enable" + function="Places.LandmarksGear.Check" parameter="sort_by_date" /> <on_click function="Places.LandmarksGear.Folding.Action" diff --git a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml index c60f670fa6..63d1a67d0f 100644 --- a/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/en/menu_places_gear_landmark.xml @@ -35,6 +35,9 @@ <on_click function="Places.LandmarksGear.Custom.Action" parameter="show_on_map" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="show_on_map" /> </menu_item_call> <menu_item_separator layout="topleft" /> @@ -85,6 +88,9 @@ <on_click function="Places.LandmarksGear.CopyPaste.Action" parameter="copy_slurl" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="copy_slurl" /> </menu_item_call> <menu_item_call label="Paste" @@ -128,6 +134,9 @@ <on_click function="Places.LandmarksGear.Folding.Action" parameter="expand_all" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="expand_all" /> </menu_item_call> <menu_item_call label="Collapse all folders" @@ -136,17 +145,23 @@ <on_click function="Places.LandmarksGear.Folding.Action" parameter="collapse_all" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="collapse_all" /> </menu_item_call> <menu_item_check label="Sort by Date" layout="topleft" name="sort_by_date"> <on_check - function="Places.LandmarksGear.Enable" + function="Places.LandmarksGear.Check" parameter="sort_by_date" /> <on_click function="Places.LandmarksGear.Folding.Action" parameter="sort_by_date" /> + <on_enable + function="Places.LandmarksGear.Enable" + parameter="sort_by_date" /> </menu_item_check> <menu_item_call label="Create Pick" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index cbc94e5e74..34d0498180 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -2933,7 +2933,8 @@ function="Advanced.GrabBakedTexture" parameter="iris" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="iris" /> </menu_item_call> <menu_item_call label="Head" @@ -2943,7 +2944,8 @@ function="Advanced.GrabBakedTexture" parameter="head" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="head" /> </menu_item_call> <menu_item_call label="Upper Body" @@ -2953,7 +2955,8 @@ function="Advanced.GrabBakedTexture" parameter="upper" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="upper" /> </menu_item_call> <menu_item_call label="Lower Body" @@ -2963,7 +2966,8 @@ function="Advanced.GrabBakedTexture" parameter="lower" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="lower" /> </menu_item_call> <menu_item_call label="Skirt" @@ -2973,17 +2977,8 @@ function="Advanced.GrabBakedTexture" parameter="skirt" /> <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> - </menu_item_call> - <menu_item_call - label="Skirt" - layout="topleft" - name="Hair"> - <menu_item_call.on_click - function="Advanced.GrabBakedTexture" - parameter="hair" /> - <menu_item_call.on_enable - function="Advanced.EnableGrabBakedTexture" /> + function="Advanced.EnableGrabBakedTexture" + parameter="skirt" /> </menu_item_call> </menu> <menu diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7c5925550a..7d2ef4923e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5523,6 +5523,13 @@ The objects on the selected parcel that are NOT owned by you have been returned <notification icon="notify.tga" + name="ServerObjectMessage" + type="notify"> +[MSG] + </notification> + + <notification + icon="notify.tga" name="NotSafe" type="notify"> This land has damage enabled. diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 100b2d7aaa..1196d788e4 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -36,15 +36,15 @@ width="5"/> <layout_panel mouse_opaque="false" - auto_resize="true" + auto_resize="false" follows="left|right" height="28" layout="topleft" left="5" min_height="28" - width="450" + width="310" top="0" - min_width="305" + min_width="300" name="chat_bar" user_resize="false" filename="panel_nearby_chat_bar.xml"/> @@ -60,21 +60,88 @@ top="0" width="3"/> <layout_panel + mouse_opaque="false" + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + width="100" + top_delta="-10" + min_width="100" + name="speak_panel" + user_resize="false"> + <chiclet_talk + follows="right" + height="20" + speak_button.font="SansSerifMedium" + speak_button.tab_stop="true" + show_button.tab_stop="true" + layout="topleft" + left="0" + name="talk" + top="6" + width="100" /> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + name="DUMMY" + top="0" + width="5"/> + <layout_panel + mouse_opaque="false" + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + width="90" + top_delta="-10" + min_width="90" + name="gesture_panel" + user_resize="false"> + <gesture_combo_box + follows="right" + height="20" + label="Gestures" + layout="topleft" + name="Gesture" + left="0" + top="6" + width="90" /> + </layout_panel> + <icon + auto_resize="false" + color="0 0 0 0" + follows="left|right" + height="10" + image_name="spacer24.tga" + layout="topleft" + left="0" + name="DUMMY" + top="0" + width="5"/> + <layout_panel mouse_opaque="false" auto_resize="false" follows="right" height="28" layout="topleft" - left="5" min_height="28" + name="movement_panel" width="70" top_delta="-10" - min_width="70" - name="movement_panel" - user_resize="false"> + min_width="70"> <button - follows="right" + follows="left|right" height="20" + use_ellipses="true" is_toggle="true" label="Move" layout="topleft" @@ -101,7 +168,7 @@ <layout_panel mouse_opaque="false" auto_resize="false" - follows="right" + follows="left|right" height="28" layout="topleft" min_height="28" @@ -110,8 +177,9 @@ top_delta="-10" width="100"> <button - follows="right" + follows="left|right" height="20" + use_ellipses="true" is_toggle="true" label="View" layout="topleft" @@ -124,22 +192,6 @@ function="Button.SetDockableFloaterToggle" parameter="camera" /> </button> - <button - follows="right" - name="camera_presets_btn" - top="6" - height="20" - width="20" - left_pad="0" - is_toggle="true" - picture_style="true" - image_selected="toggle_button_selected" - image_unselected="toggle_button_off"> - <button.init_callback - function="Button.SetDockableFloaterToggle" - parameter="camera_presets" - /> - </button> </layout_panel> <layout_panel mouse_opaque="false" @@ -183,8 +235,10 @@ min_height="28" top="0" name="chiclet_list_panel" - width="150" - user_resize="false"> + width="189" + min_width="189" + user_resize="false" + auto_resize="true"> <chiclet_panel mouse_opaque="false" follows="left|right" @@ -195,7 +249,7 @@ top="1" chiclet_padding="3" scrolling_offset="40" - width="150" /> + width="189" /> </layout_panel> <icon auto_resize="false" @@ -282,4 +336,4 @@ top="0" width="5"/> </layout_stack> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml index be38492c82..9767a673f6 100644 --- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml +++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml @@ -4,7 +4,7 @@ width="146" height="215" border="false"> - <avatar_list_tmp + <avatar_list color="DkGray2" follows="left|top|right|bottom" height="150" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml index 7e8b553644..cc47e99c2c 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_general.xml @@ -8,6 +8,7 @@ left="102" mouse_opaque="true" name="Media Settings General" + help_topic = "media_settings_general" width="365"> <text @@ -31,6 +32,27 @@ <!-- <line_editor.commit_callback function="Media.CommitHomeURL"/> --> </line_editor> + + <web_browser + border_visible="true" + bottom_delta="-133" + follows="top|left" + left="120" + name="preview_media" + width="128" + height="128" + start_url="about:blank" + decouple_texture_size="true" /> + + <text + bottom_delta="-15" + follows="top|left" + height="15" + left="164" + name=""> + Preview + </text> + <text bottom_delta="-20" follows="top|left" @@ -61,27 +83,6 @@ <button.commit_callback function="Media.ResetCurrentUrl"/> </button> - - <web_browser - border_visible="false" - bottom_delta="-133" - follows="top|left" - left="120" - name="preview_media" - width="128" - height="128" - start_url="about:blank" - decouple_texture_size="true" /> - - <text - bottom_delta="-15" - follows="top|left" - height="15" - left="164" - name=""> - Preview - </text> - <text bottom_delta="-5" follows="top|left" diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml index 0cc1406d62..85f534c4a3 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml @@ -8,6 +8,7 @@ left="102" mouse_opaque="true" name="Media settings for controls" + help_topic = "media_settings_controls" width="365"> <text @@ -15,7 +16,6 @@ follows="top|left" height="15" left="10" - name="media_perms_label_owner" enabled="false"> Owner </text> @@ -53,9 +53,8 @@ follows="top|left" height="15" left="10" - name="media_perms_label_group" enabled="false"> - Group + Group: </text> <name_box @@ -101,7 +100,6 @@ follows="top|left" height="15" left="10" - name="media_perms_label_anyone" enabled="false"> Anyone </text> diff --git a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml index 695e956e41..a26f74844e 100644 --- a/indra/newview/skins/default/xui/en/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/en/panel_media_settings_security.xml @@ -8,6 +8,7 @@ left="102" mouse_opaque="true" name="Media Settings Security" + help_topic = "media_settings_security" width="365"> <check_box bottom_delta="-40" diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 4e1ea0f490..4175d21639 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -8,10 +8,33 @@ layout="topleft" name="navigation_bar" width="600"> + <icon + follows="all" + image_name="NavBar_BG" + mouse_opaque="true" + name="bg_icon" + scale_image="true" + visible="true" + left="0" + top="0" + height="65" + width="600"/> + <icon + follows="all" + image_name="NavBar_BG_NoFav" + mouse_opaque="true" + name="bg_icon_no_fav" + scale_image="true" + visible="false" + left="0" + top="0" + height="65" + width="600"/> <panel background_visible="false" follows="left|top|right" - height="60" + top="5" + height="23" layout="topleft" name="navigation_panel" width="600"> @@ -131,12 +154,12 @@ <favorites_bar follows="left|right|top" - height="25" + height="15" layout="topleft" left="0" name="favorite" image_drag_indication="Arrow_Down" chevron_button_tool_tip="Show more of My Favorites" - bottom="65" + bottom="62" width="590" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 4219d9f58f..2fd82d8f3d 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -7,7 +7,13 @@ left="0" name="chat_bar" top="24" - width="510"> + width="310"> + <string name="min_width"> + 310 + </string> + <string name="max_width"> + 320 + </string> <line_editor border_style="line" border_thickness="1" @@ -45,27 +51,4 @@ tool_tip="Shows/hides nearby chat log"> <button.commit_callback function="Floater.Toggle" parameter="nearby_chat"/> </button> - <chiclet_talk - follows="right" - height="20" - speak_button.font="SansSerifMedium" - speak_button.tab_stop="true" - show_button.tab_stop="true" - layout="topleft" - left_pad="5" - name="talk" - top="3" - width="100" - speak_button.tool_tip="Turns microphone on/off" - show_button.tool_tip="Shows/hides voice control panel" /> - <gesture_combo_box - follows="right" - height="20" - label="Gestures" - layout="topleft" - name="Gesture" - left_pad="5" - top="3" - width="90" - tool_tip="Shows/hides gestures" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 085b732473..7b19ab1a1c 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -66,11 +66,13 @@ background_visible="true" top="0" width="313"> <avatar_list + allow_select="true" follows="all" height="470" ignore_online_status="true" layout="topleft" left="0" + multi_select="true" name="avatar_list" top="0" volume_column_width="20" @@ -124,10 +126,12 @@ background_visible="true" name="tab_online" title="Online"> <avatar_list + allow_select="true" follows="all" height="150" layout="topleft" left="0" + multi_select="true" name="avatars_online" top="0" width="313" /> @@ -139,10 +143,12 @@ background_visible="true" name="tab_all" title="All"> <avatar_list + allow_select="true" follows="all" height="230" layout="topleft" left="0" + multi_select="true" name="avatars_all" top="0" width="313" /> @@ -288,10 +294,12 @@ background_visible="true" name="recent_panel" width="313"> <avatar_list + allow_select="true" follows="all" height="470" layout="topleft" left="0" + multi_select="true" name="avatar_list" top="2" width="313" /> diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index ac2cf19a96..cbe1f11e3d 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -71,59 +71,60 @@ width="18" /> </panel> <panel - follows="bottom" - auto_resize="false" layout="topleft" - height="19" + left="0" + height="25" + top_pad="10" name="buttons_cucks" + help_topic="picks_button_tab" width="313"> <button + enabled="false" follows="bottom|left" - height="19" - label="Add" + font="SansSerifSmallBold" + height="25" + label="Info" layout="topleft" - left="0" - mouse_opaque="false" - name="add_friend" - top="5" + left="5" + name="info_btn" + tab_stop="false" + top="0" width="55" /> <button - follows="bottom|left" - height="19" - label="IM" - layout="topleft" - name="im" - top="5" - left_pad="5" - width="40" /> - <button enabled="false" follows="bottom|left" - height="19" - label="Call" + font="SansSerifSmallBold" + height="25" + label="Teleport" layout="topleft" - name="call" left_pad="5" - top="5" - width="55" /> + name="teleport_btn" + tab_stop="false" + top="0" + width="77" /> <button enabled="false" follows="bottom|left" - height="19" + font="SansSerifSmallBold" + height="25" label="Map" layout="topleft" - name="show_on_map_btn" - top="5" left_pad="5" + name="show_on_map_btn" + tab_stop="false" + top="0" width="50" /> <button - follows="bottom|left" - height="19" - label="Teleport" + enabled="false" + follows="bottom|right" + font="SansSerifSmallBold" + height="25" + label="▼" layout="topleft" - name="teleport" - left_pad="5" - top="5" - width="90" /> + name="overflow_btn" + right="-10" + tab_stop="false" + top="0" + width="30" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index c4dc8834db..ce7939c00f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -77,10 +77,19 @@ name="cookies_enabled" top_pad="10" width="350" /> + <check_box + control_name="AutoPlayMedia" + height="16" + label="Allow Media Autoplay" + layout="topleft" + left="30" + name="autoplay_enabled" + top_pad="10" + width="350" /> <text - type="string" - length="1" - follows="left|top" + type="string" + length="1" + follows="left|top" height="10" layout="topleft" left="30" @@ -88,8 +97,9 @@ top_pad="10" width="350"> Logs: - </text> + </text> <check_box + enabled="false" control_name="LogInstantMessages" height="16" diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml index a32be90a33..73a759a8ba 100644 --- a/indra/newview/skins/default/xui/en/panel_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_profile.xml @@ -53,7 +53,7 @@ left="10" name="second_life_image_panel" top="0" - width="290"> + width="280"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -75,13 +75,14 @@ text_color="white" top_delta="0" value="[SECOND_LIFE]:" - width="170" /> + width="165" /> <expandable_text follows="left|top|right" height="95" layout="topleft" left="107" name="sl_description_edit" + top_pad="-3" width="173" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -95,7 +96,7 @@ top_pad="10" left="10" name="first_life_image_panel" - width="290"> + width="280"> <texture_picker allow_no_texture="true" default_image_name="None" @@ -116,13 +117,14 @@ text_color="white" top_delta="0" value="Real World:" - width="173" /> + width="165" /> <expandable_text follows="left|top|right" height="95" layout="topleft" left="107" name="fl_description_edit" + top_pad="-3" width="173" expanded_bg_visible="true" expanded_bg_color="DkGray"> @@ -151,7 +153,7 @@ name="homepage_edit" top_pad="0" value="http://librarianavengers.org" - width="290" + width="280" word_wrap="false" use_elipsis="true" /> @@ -205,7 +207,7 @@ name="acc_status_text" top_pad="0" value="Resident. No payment info on file." - width="295" + width="280" word_wrap="true" /> <text follows="left|top" @@ -215,7 +217,7 @@ left="10" name="title_partner_text" text_color="white" - top_pad="10" + top_pad="5" value="Partner:" width="280" /> <panel @@ -245,21 +247,21 @@ left="10" name="title_groups_text" text_color="white" - top_pad="10" + top_pad="8" value="Groups:" width="280" /> - <text + <expandable_text follows="left|top|bottom" - height="160" + height="60" layout="topleft" left="10" - name="sl_groups" - top_pad="0" - width="290" - word_wrap="true" - use_elipsis="true"> + name="sl_groups" + top_pad="0" + width="280" + expanded_bg_visible="true" + expanded_bg_color="DkGray"> Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. - </text> + </expandable_text> </panel> </scroll_container> <panel @@ -270,17 +272,17 @@ top_pad="2" bottom="10" height="19" - width="313"> + width="303"> <button follows="bottom|left" height="19" - label="Add" + label="Add Friend" layout="topleft" left="0" mouse_opaque="false" name="add_friend" top="5" - width="55" /> + width="75" /> <button follows="bottom|left" height="19" @@ -289,7 +291,7 @@ name="im" top="5" left_pad="5" - width="40" /> + width="45" /> <button enabled="false" follows="bottom|left" @@ -299,7 +301,7 @@ name="call" left_pad="5" top="5" - width="55" /> + width="45" /> <button enabled="false" follows="bottom|left" @@ -309,7 +311,7 @@ name="show_on_map_btn" top="5" left_pad="5" - width="50" /> + width="45" /> <button follows="bottom|left" height="19" @@ -318,7 +320,7 @@ name="teleport" left_pad="5" top="5" - width="90" /> + width="80" /> </panel> <panel follows="bottom|left" @@ -328,7 +330,7 @@ name="profile_me_buttons_panel" visible="false" height="19" - width="313"> + width="303"> <button follows="bottom|right" font="SansSerifSmall" diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 8a48574440..7a5781651d 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -52,8 +52,9 @@ height="535" layout="topleft" left="10" + min_width="333" name="tabs" - tab_min_width="95" + tab_min_width="80" tab_height="30" tab_position="top" top_pad="10" @@ -61,21 +62,21 @@ <panel class="panel_profile" filename="panel_profile.xml" - label="Profile" + label="PROFILE" layout="topleft" help_topic="profile_profile_tab" name="panel_profile" /> <panel class="panel_picks" filename="panel_picks.xml" - label="Picks" + label="PICKS" layout="topleft" help_topic="profile_picks_tab" name="panel_picks" /> <panel class="panel_notes" filename="panel_notes.xml" - label="Notes & Privacy" + label="NOTES & PRIVACY" layout="topleft" help_topic="profile_notes_tab" name="panel_notes" /> diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml index 6abcbc40d2..3f64c9c633 100644 --- a/indra/newview/skins/default/xui/en/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml @@ -35,6 +35,7 @@ tab_title="People" description="Find your friends, contacts and people nearby." image="TabIcon_People_Off" + image_selected="TabIcon_People_Selected" mouse_opaque="false" background_visible="true" > @@ -77,6 +78,7 @@ label="Places" description="Find places to go and places you've visited before." image="TabIcon_Places_Off" + image_selected="TabIcon_Places_Selected" mouse_opaque="false" background_visible="true" > @@ -95,6 +97,7 @@ tab_title="Me" description="Edit your public profile and Picks." image="TabIcon_Me_Off" + image_selected="TabIcon_Me_Selected" mouse_opaque="false" background_visible="true" > @@ -112,6 +115,7 @@ tab_title="Appearance" description="Change your appearance and current look." image="TabIcon_Appearance_Off" + image_selected="TabIcon_Appearance_Selected" mouse_opaque="false" background_visible="true" > diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a57c9cd97f..4c19b22ac5 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -1819,6 +1819,7 @@ this texture in your inventory <string name="broken_link" value=" (broken_link)" /> <string name="LoadingContents">Loading contents...</string> <string name="NoContents">No contents</string> + <string name="WornOnAttachmentPoint"> (worn on [ATTACHMENT_POINT])</string> <!-- Gestures labels --> <!-- use value="" because they have preceding spaces --> |