diff options
Diffstat (limited to 'indra/newview/skins/default/xui/en')
39 files changed, 999 insertions, 1012 deletions
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 bac3ea86f1..e30e958543 100644 --- a/indra/newview/skins/default/xui/en/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/en/floater_avatar_textures.xml @@ -1,321 +1,306 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <floater legacy_header_height="18" - height="700" + height="660" layout="topleft" name="avatar_texture_debug" help_topic="avatar_texture_debug" title="AVATAR TEXTURES" - width="940" - can_resize="true"> + width="1253"> <floater.string name="InvalidAvatar"> INVALID AVATAR </floater.string> - - <scroll_container - color="DkGray2" - opaque="true" - follows="all" - height="680" - layout="topleft" - left="5" - top_pad="15" - name="profile_scroll" - reserve_scroll_corner="false" - width="930"> - <panel - name="scroll_content_panel" - follows="left|top" - min_height="300" - layout="topleft" - top="0" - background_visible="false" - left="0" - height="680"> <text type="string" length="1" height="16" layout="topleft" - left="15" + left="30" name="label" - top="20" - width="90"> - Baked -Textures + top="40" + width="80"> + Baked Textures </text> <text type="string" length="1" height="16" layout="topleft" - left_pad="22" + left_pad="50" name="composite_label" top_delta="0" width="120"> - Composite -Textures + Composite Textures </text> <button - height="40" + height="20" label="Dump IDs to Console" label_selected="Dump" layout="topleft" + left_pad="530" name="Dump" top_delta="0" - right="-10" width="150" /> + <scroll_container + color="DkGray2" + opaque="true" + follows="all" + height="590" + layout="topleft" + left="5" + top_pad="5" + name="profile_scroll" + reserve_scroll_corner="false" + width="1240"> <panel name="scroll_content_panel" follows="left|top" min_height="300" layout="topleft" - top="43" + top="0" background_visible="false" - height="930" + height="950" left="0" - width="1230"> - + width="1250"> <texture_picker - height="103" + height="143" label="Hair" layout="topleft" left="10" name="hair-baked" top="17" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Hair" layout="topleft" - left_pad="21" + left_pad="7" name="hair_grain" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Hair Alpha" layout="topleft" left_pad="7" name="hair_alpha" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Head" layout="topleft" left="10" name="head-baked" - top_delta="100" - width="92" /> + top="167" + width="128" /> <texture_picker - height="103" + height="143" label="Makeup" layout="topleft" - left_pad="21" + left_pad="7" name="head_bodypaint" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Head Alpha" layout="topleft" left_pad="7" name="head_alpha" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Head Tattoo" layout="topleft" left_pad="7" name="head_tattoo" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Eyes" layout="topleft" left="10" name="eyes-baked" - top_delta="100" - width="92" /> + top="317" + width="128" /> <texture_picker - height="103" + height="143" label="Eye" layout="topleft" - left_pad="21" + left_pad="7" name="eyes_iris" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Eyes Alpha" layout="topleft" left_pad="7" name="eyes_alpha" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Upper Body" layout="topleft" left="10" name="upper-baked" - top_delta="100" - width="92" /> + top="467" + width="128" /> <texture_picker - height="103" - label="Upper BodyPaint" + height="143" + label="Upper Body Bodypaint" layout="topleft" - left_pad="21" + left_pad="7" name="upper_bodypaint" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Undershirt" layout="topleft" left_pad="7" name="upper_undershirt" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Gloves" layout="topleft" left_pad="7" name="upper_gloves" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Shirt" layout="topleft" left_pad="7" name="upper_shirt" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Upper Jacket" layout="topleft" left_pad="7" name="upper_jacket" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Upper Alpha" layout="topleft" left_pad="7" name="upper_alpha" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Upper Tattoo" layout="topleft" left_pad="7" name="upper_tattoo" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Lower Body" layout="topleft" left="10" name="lower-baked" - top_delta="100" - width="92" /> + top="617" + width="128" /> <texture_picker - height="103" - label="Lower BodyPaint" + height="143" + label="Lower Body Bodypaint" layout="topleft" - left_pad="21" + left_pad="7" name="lower_bodypaint" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Underpants" layout="topleft" left_pad="7" name="lower_underpants" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Socks" layout="topleft" left_pad="7" name="lower_socks" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Shoes" layout="topleft" left_pad="7" name="lower_shoes" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Pants" layout="topleft" left_pad="7" name="lower_pants" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Jacket" layout="topleft" left_pad="7" name="lower_jacket" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Lower Alpha" layout="topleft" left_pad="7" name="lower_alpha" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Lower Tattoo" layout="topleft" left_pad="7" name="lower_tattoo" top_delta="0" - width="92" /> + width="128" /> <texture_picker - height="103" + height="143" label="Skirt" layout="topleft" left="10" name="skirt-baked" - top_delta="100" - width="92" /> + top="767" + width="128" /> <texture_picker - height="103" + height="143" label="Skirt" layout="topleft" - left_pad="21" + left_pad="7" name="skirt" top_delta="0" - width="92" /> -</panel> + width="128" /> </panel> </scroll_container> -</floater>
\ No newline at end of file +</floater> diff --git a/indra/newview/skins/default/xui/en/floater_customize.xml b/indra/newview/skins/default/xui/en/floater_customize.xml index 01bced81d0..32460e937d 100644 --- a/indra/newview/skins/default/xui/en/floater_customize.xml +++ b/indra/newview/skins/default/xui/en/floater_customize.xml @@ -11,7 +11,7 @@ save_rect="true" title="APPEARANCE" top_delta="-185" - width="600"> + width="524"> <tab_container height="517" layout="topleft" @@ -21,7 +21,7 @@ tab_position="left" tab_height="50" top="26" - width="580"> + width="506"> <text type="string" length="1" @@ -65,15 +65,15 @@ mouse_opaque="true" width="16" /> <button - follows="left|top" + follows="right|bottom" height="23" - label="Create New Shape" - label_selected="Create New Shape" + label="Revert" + label_selected="Revert" layout="topleft" - left="10" - name="Create New" - top="104" - width="160" /> + right="390" + name="Revert" + top="477" + width="82" /> <button follows="left|top" height="23" @@ -280,46 +280,46 @@ type="string" length="1" top="488" - follows="left|top" + follows="left|top|right" font="SansSerif" halign="right" height="23" layout="topleft" - left="10" name="Item Action Label" - width="130"> + right="90" + width="100"> Shape: </text> <button - follows="left|bottom" + follows="left|top" + height="23" + label="Create New Shape" + label_selected="Create New Shape" + layout="topleft" + left="10" + name="Create New" + top="104" + width="160" /> + <button + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" name="Save" - left_pad="2" + right="186" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" name="Save As" top="477" - left_pad="3" + right="304" width="115" /> - <button - follows="left|bottom" - height="23" - label="Revert" - label_selected="Revert" - layout="topleft" - left_pad="3" - name="Revert" - top="477" - width="120" /> </panel> <panel border="false" @@ -352,16 +352,6 @@ <button follows="left|top" height="23" - label="Create New Skin" - label_selected="Create New Skin" - layout="topleft" - left_delta="0" - name="Create New" - top_delta="-249" - width="160" /> - <button - follows="left|top" - height="23" label="Skin Color" label_selected="Skin Color" layout="topleft" @@ -489,6 +479,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + top="488" + follows="left|top|right" + font="SansSerif" + halign="right" + height="23" + layout="topleft" + name="Item Action Label" + right="90" + width="100"> + Skin: + </text> <texture_picker allow_no_texture="true" can_apply_immediately="true" @@ -528,50 +532,46 @@ tool_tip="Click to choose a picture" top_delta="102" width="82" /> - <text - type="string" - length="1" - top="488" + <button follows="left|top" - font="SansSerif" - halign="right" height="23" + label="Create New Skin" + label_selected="Create New Skin" layout="topleft" - left="10" - name="Item Action Label" - width="130"> - Skin: - </text> + left_delta="0" + name="Create New" + top_delta="-249" + width="160" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -729,6 +729,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + top="488" + follows="left|top|right" + font="SansSerif" + halign="right" + height="23" + layout="topleft" + name="Item Action Label" + right="90" + width="100"> + Hair: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -751,50 +765,36 @@ name="Create New" top_delta="-89" width="160" /> - <text - type="string" - length="1" - top="488" - follows="left|top" - font="SansSerif" - halign="right" - height="23" - layout="topleft" - name="Item Action Label" - left="10" - width="130"> - Hair: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -914,6 +914,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Eyes: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -935,50 +949,36 @@ name="Create New" top="66" width="160" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - name="Item Action Label" - left="10" - width="130"> - Eyes: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <text type="string" @@ -1063,50 +1063,36 @@ name="Create New" top="66" width="160" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - name="Item Action Label" - left="10" - width="130"> - Shirt: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> <text type="string" length="1" @@ -1197,6 +1183,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Shirt: + </text> </panel> <panel border="false" @@ -1266,50 +1266,36 @@ name="Create New" top="66" width="160" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - name="Item Action Label" - left="10" - width="130"> - Pants: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> <text type="string" length="1" @@ -1400,6 +1386,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Pants: + </text> </panel> <panel border="false" @@ -1528,6 +1528,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Shoes: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -1559,50 +1573,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Shoes: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -1731,6 +1731,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Socks: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -1762,50 +1776,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Socks: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -1934,6 +1934,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Jacket: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -1976,50 +1990,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Jacket: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -2148,6 +2148,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Gloves: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -2179,50 +2193,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Gloves: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -2351,6 +2351,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Undershirt: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -2382,50 +2396,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Undershirt: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -2554,6 +2554,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Underpants: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -2585,50 +2599,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Underpants: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -2757,6 +2757,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Skirt: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -2788,50 +2802,36 @@ name="Take Off" top_pad="4" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Skirt: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -2960,6 +2960,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Tattoo: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -3004,50 +3018,36 @@ top_pad="4" left="10" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Tattoo: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> <panel border="false" @@ -3176,6 +3176,20 @@ width="373"> You do not have permission to modify this wearable. </text> + <text + type="string" + length="1" + bottom="4" + follows="left|bottom|right" + font="SansSerif" + halign="right" + height="23" + layout="bottomleft" + name="Item Action Label" + right="90" + width="100"> + Alpha: + </text> <texture_picker can_apply_immediately="true" default_image_name="Default" @@ -3285,61 +3299,47 @@ left="10" top_pad="20" width="82" /> - <text - type="string" - length="1" - bottom="4" - follows="left|bottom" - font="SansSerif" - halign="right" - height="23" - layout="bottomleft" - left="10" - name="Item Action Label" - width="130"> - Alpha: - </text> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save" label_selected="Save" layout="topleft" - left_pad="2" + right="186" name="Save" top="477" width="82" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Save As..." label_selected="Save As..." layout="topleft" - left_pad="3" + right="304" name="Save As" top="477" width="115" /> <button - follows="left|bottom" + follows="right|bottom" height="23" label="Revert" label_selected="Revert" layout="topleft" - left_pad="3" + right="390" name="Revert" top="477" - width="120" /> + width="82" /> </panel> </tab_container> <scroll_container follows="left|top|right|bottom" height="409" layout="topleft" - left="247" + left="211" mouse_opaque="false" name="panel_container" top="92" - width="330"> + width="292"> <scrolling_panel_list follows="left|bottom" layout="topleft" @@ -3355,7 +3355,7 @@ name="script_info" tool_tip="Show scripts attached to your avatar" left="13" - width="90" ></button> + width="90" /> <button bottom="574" follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml index 9db6568ee3..5ea207675b 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -119,7 +119,7 @@ No Answer. Please try again later. layout="topleft" left="77" name="leaving" - top="62" + top="52" width="315" word_wrap="true"> Leaving [CURRENT_CHAT]. diff --git a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml index d1db5c17ba..e94af2c8d5 100644 --- a/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml +++ b/indra/newview/skins/default/xui/en/floater_script_debug_panel.xml @@ -18,7 +18,6 @@ max_length="2147483647" name="Chat History Editor" parse_highlights="true" - read_only="true" width="420" word_wrap="true" /> </floater> 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 bf5bd87ad6..5b77f11d71 100644 --- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml @@ -3,7 +3,7 @@ can_resize="true" can_minimize="true" can_close="false" - height="205" + height="202" layout="topleft" min_height="124" min_width="190" @@ -47,10 +47,10 @@ width="263"> <layout_panel follows="top|left|right" - user_resize="false" - auto_resize="false" + user_resize="false" + auto_resize="false" layout="topleft" - height="20" + height="26" name="my_panel"> <avatar_icon enabled="false" @@ -86,44 +86,29 @@ visible="true" width="20" /> </layout_panel> - <layout_stack - clip="true" - auto_resize="false" - follows="left|top|right" - height="26" - layout="topleft" - mouse_opaque="false" - name="voice_effect_and_leave_call_stack" - orientation="horizontal" - width="262"> - <panel - class="panel_voice_effect" - name="panel_voice_effect" - visiblity_control="VoiceMorphingEnabled" - filename="panel_voice_effect.xml" /> - <layout_panel - auto_resize="false" - user_resize="false" - follows="top|right" - height="23" - visible="true" - layout="topleft" - name="leave_call_btn_panel" - width="100"> - <button - follows="right|top" - height="23" - label="Leave Call" - name="leave_call_btn" - width="100" /> - </layout_panel> - </layout_stack> + <layout_panel + auto_resize="false" + user_resize="false" + follows="top|left" + height="26" + visible="true" + layout="topleft" + name="leave_call_btn_panel" + width="100"> + <button + follows="right|top" + height="23" + top_pad="0" + label="Leave Call" + name="leave_call_btn" + width="100" /> + </layout_panel> <layout_panel follows="all" layout="topleft" left="2" top_pad="0" - height="132" + height="132" name="callers_panel" user_resize="false" width="280"> 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 20629018e2..233ab2c1b2 100644 --- a/indra/newview/skins/default/xui/en/floater_world_map.xml +++ b/indra/newview/skins/default/xui/en/floater_world_map.xml @@ -2,7 +2,8 @@ <floater legacy_header_height="18" can_resize="true" - open_centered="true" + center_horiz="true" + center_vert="true" height="600" layout="topleft" min_height="520" @@ -178,16 +179,16 @@ width="90"> Land Sale </text> - <icon - color="0.5 0.25 1 1" + <icon + color="1 1 0.25 1" follows="top|right" height="16" image_name="legend.tga" layout="topleft" mouse_opaque="true" name="square2" - left="20" - top_pad="2" + left="41" + top_pad="-2" width="16" /> <text type="string" @@ -196,21 +197,21 @@ height="16" layout="topleft" left_pad="0" - name="auction_label" + name="by_owner_label" top_delta="3" - width="170"> - land auction + width="100"> + by owner </text> - <icon - color="1 1 0.25 1" + <icon + color="0.5 0.25 1 1" follows="top|right" height="16" image_name="legend.tga" layout="topleft" mouse_opaque="true" name="square2" - left="20" - top_pad="-5" + left="41" + top_pad="-3" width="16" /> <text type="string" @@ -219,10 +220,10 @@ height="16" layout="topleft" left_pad="0" - name="by_owner_label" + name="auction_label" top_delta="3" - width="100"> - by owner + width="170"> + land auction </text> <button @@ -306,7 +307,7 @@ initial_value="true" layout="topleft" left="135" - name="events_mature_chk" + name="event_mature_chk" top_pad="3" width="22" /> <icon @@ -328,7 +329,7 @@ top_delta="2" left_pad="3" layout="topleft" - name="events_mature_label" + name="mature_label" width="66"> Moderate </text> @@ -339,7 +340,7 @@ height="16" layout="topleft" left="135" - name="events_adult_chk" + name="event_adult_chk" top_pad="3" width="22" /> <icon @@ -361,7 +362,7 @@ top_delta="2" left_pad="3" layout="topleft" - name="events_adult_label" + name="adult_label" width="66"> Adult </text> @@ -395,7 +396,7 @@ <panel follows="right|top|bottom" - height="330" + height="310" top_pad="0" width="238" name="layout_panel_4"> @@ -534,69 +535,9 @@ <scroll_list.commit_callback function="WMap.SearchResult" /> </scroll_list> - <text - type="string" - length="1" - follows="right|bottom" - halign="right" - height="16" - layout="topleft" - left="25" - name="events_label" - top_pad="16" - width="70"> - Location: - </text> - <spinner - control_name="Teleport_Coordinate_X" - decimal_digits="0" - follows="right|bottom" - height="23" - increment="1" - initial_value="128" - layout="topleft" - left_delta="74" - max_val="255" - min_val="0" - name="teleport_coordinate_x" - width="44" > - <spinner.commit_callback - function="WMap.Coordinates" /> - </spinner> - <spinner - control_name="Teleport_Coordinate_Y" - decimal_digits="0" - follows="right|bottom" - height="23" - increment="1" - initial_value="128" - layout="topleft" - left_delta="47" - max_val="255" - min_val="0" - name="teleport_coordinate_y" > - <spinner.commit_callback - function="WMap.Coordinates" /> - </spinner> - <spinner - control_name="Teleport_Coordinate_Z" - decimal_digits="0" - follows="right|bottom" - height="23" - increment="1" - initial_value="128" - layout="topleft" - left_delta="47" - max_val="255" - min_val="0" - name="teleport_coordinate_z"> - <spinner.commit_callback - function="WMap.Coordinates" /> - </spinner> - <button + <button follows="right|bottom" height="23" - image_unselected="PushButton_On" label="Teleport" layout="topleft" left="25" @@ -633,6 +574,66 @@ <button.commit_callback function="WMap.ShowTarget" /> </button> + +<!-- <text + type="string" + length="1" + follows="bottom|right" + halign="left" + height="16" + top_pad="4" + left="25" + layout="topleft" + name="land_sale_label" + width="250"> + Location: + </text> + <spinner + decimal_digits="0" + follows="bottom|right" + increment="1" + initial_value="128" + layout="topleft" + top_pad="0" + left="25" + max_val="255" + name="spin x" + tool_tip="X coordinate of location to show on map" + width="48"> + <spinner.commit_callback + function="WMap.CommitLocation" /> + </spinner> + <spinner + decimal_digits="0" + follows="bottom|right" + height="16" + increment="1" + initial_value="128" + layout="topleft" + left_pad="2" + max_val="255" + name="spin y" + tool_tip="Y coordinate of location to show on map" + top_delta="0" + width="48" > + <spinner.commit_callback + function="WMap.CommitLocation" /> + </spinner> + <spinner + decimal_digits="0" + follows="bottom|right" + increment="1" + initial_value="0" + layout="topleft" + left_pad="2" + max_val="4096" + name="spin z" + tool_tip="Z coordinate of location to show on map" + top_delta="0" + width="48"> + <spinner.commit_callback + function="WMap.CommitLocation" /> + </spinner>--> </panel> <panel follows="right|bottom" 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 e2348375d5..5c30b9ee94 100644 --- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml @@ -11,7 +11,8 @@ function="Object.Touch" /> <menu_item_call.on_enable function="Object.EnableTouch" - name="EnableTouch"/> + name="EnableTouch" + parameter="Touch" /> </menu_item_call> <!--menu_item_call label="Stand Up" @@ -43,67 +44,61 @@ <menu_item_call.on_enable function="Attachment.EnableDetach" /> </menu_item_call> - <menu_item_separator - layout="topleft" /> - - <menu_item_call -label="Stand Up" -layout="topleft" -name="Stand Up"> - <menu_item_call.on_click - function="Self.StandUp" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableStandUp" /> - </menu_item_call> - <menu_item_call - label="Change Outfit" - name="Change Outfit"> - <menu_item_call.on_click - function="CustomizeAvatar" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> - </menu_item_call> - <menu_item_call label="Edit My Outfit" -layout="topleft" -name="Edit Outfit"> - <menu_item_call.on_click - function="EditOutfit" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> - </menu_item_call> - <menu_item_call label="Edit My Shape" - layout="topleft" - name="Edit My Shape"> - <menu_item_call.on_click - function="EditShape" /> - <menu_item_call.on_enable - function="Edit.EnableEditShape" /> - </menu_item_call> - <menu_item_call - label="My Friends" - layout="topleft" - name="Friends..."> - <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="friends_panel" /> - </menu_item_call> - <menu_item_call - label="My Groups" - layout="topleft" - name="Groups..."> - <menu_item_call.on_click - function="SideTray.PanelPeopleTab" - parameter="groups_panel" /> - </menu_item_call> - <menu_item_call - label="My Profile" - layout="topleft" - name="Profile..."> - <menu_item_call.on_click - function="ShowAgentProfile" - parameter="agent" /> - </menu_item_call> + <menu_item_call + enabled="false" + label="Drop" + layout="topleft" + name="Drop"> + <menu_item_call.on_click + function="Attachment.Drop" /> + <menu_item_call.on_enable + function="Attachment.EnableDrop" /> + </menu_item_call> + <menu_item_separator + layout="topleft" /> + + <menu_item_call + label="Stand Up" + layout="topleft" + name="Stand Up"> + <menu_item_call.on_click + function="Self.StandUp" + parameter="" /> + <menu_item_call.on_enable + function="Self.EnableStandUp" /> + </menu_item_call> + <menu_item_call + label="My Appearance" + name="Appearance..."> + <menu_item_call.on_click + function="CustomizeAvatar" /> + <menu_item_call.on_enable + function="Edit.EnableCustomizeAvatar" /> + </menu_item_call> + <menu_item_call + label="My Friends" + layout="topleft" + name="Friends..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="friends_panel" /> + </menu_item_call> + <menu_item_call + label="My Groups" + layout="topleft" + name="Groups..."> + <menu_item_call.on_click + function="SideTray.PanelPeopleTab" + parameter="groups_panel" /> + </menu_item_call> + <menu_item_call + label="My Profile" + layout="topleft" + name="Profile..."> + <menu_item_call.on_click + function="ShowAgentProfile" + parameter="agent" /> + </menu_item_call> <menu_item_call label="Debug Textures" name="Debug..."> @@ -112,16 +107,4 @@ name="Edit Outfit"> <menu_item_call.on_visible function="IsGodCustomerService"/> </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - enabled="false" - label="Drop" - layout="topleft" - name="Drop"> - <menu_item_call.on_click - function="Attachment.Drop" /> - <menu_item_call.on_enable - function="Attachment.EnableDrop" /> - </menu_item_call> </context_menu> 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 d5b993152a..a21c1ac44b 100644 --- a/indra/newview/skins/default/xui/en/menu_avatar_self.xml +++ b/indra/newview/skins/default/xui/en/menu_avatar_self.xml @@ -183,30 +183,14 @@ </menu_item_call> </context_menu> <menu_item_call - label="Change Outfit" + label="My Appearance" layout="topleft" - name="Chenge Outfit"> + name="Appearance..."> <menu_item_call.on_click function="CustomizeAvatar" /> <menu_item_call.on_enable function="Edit.EnableCustomizeAvatar" /> </menu_item_call> - <menu_item_call label="Edit My Outfit" - layout="topleft" - name="Edit Outfit"> - <menu_item_call.on_click - function="EditOutfit" /> - <menu_item_call.on_enable - function="Edit.EnableCustomizeAvatar" /> - </menu_item_call> - <menu_item_call label="Edit My Shape" - layout="topleft" - name="Edit My Shape"> - <menu_item_call.on_click - function="EditShape" /> - <menu_item_call.on_enable - function="Edit.EnableEditShape" /> - </menu_item_call> <menu_item_call label="My Friends" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml index a5ac5f76e1..334decdf58 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml @@ -89,7 +89,7 @@ function="InspectAvatar.VisibleFreezeEject"/> </menu_item_call> <menu_item_call - label="Debug" + label="Debug Textures" name="debug"> <menu_item_call.on_click function="Avatar.Debug"/> diff --git a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml index ea18e02ca1..03bd93e271 100644 --- a/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml @@ -16,8 +16,8 @@ function="Self.EnableStandUp" /> </menu_item_call> <menu_item_call - label="Change Outfit" - name="change_outfit"> + label="My Appearance" + name="my_appearance"> <menu_item_call.on_click function="CustomizeAvatar" /> <menu_item_call.on_enable diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index c0046d8e28..5e1f6b58e8 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -410,14 +410,6 @@ parameter="open" /> </menu_item_call> <menu_item_call - label="Open Original" - layout="topleft" - name="Open Original"> - <menu_item_call.on_click - function="Inventory.DoToSelected" - parameter="open_original" /> - </menu_item_call> - <menu_item_call label="Properties" layout="topleft" name="Properties"> @@ -472,7 +464,7 @@ layout="topleft" name="Paste Separator" /> <menu_item_call - label="Delete" + label="Remove Link" layout="topleft" name="Remove Link"> <menu_item_call.on_click @@ -606,7 +598,7 @@ </menu_item_call> <menu_item_separator layout="topleft" - name="Wearable And Object Separator"/> + name="Attach Separator"/> <menu_item_call label="Detach From Yourself" layout="topleft" @@ -629,10 +621,10 @@ <menu_item_call label="Wear" layout="topleft" - name="Wearable And Object Wear"> + name="Object Wear"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="wear" /> + parameter="attach" /> </menu_item_call> <menu label="Attach To" @@ -642,6 +634,9 @@ label="Attach To HUD" layout="topleft" name="Attach To HUD" /> + <menu_item_separator + layout="topleft" + name="Wearable Separator"/> <menu_item_call label="Edit" layout="topleft" @@ -651,12 +646,12 @@ parameter="edit" /> </menu_item_call> <menu_item_call - label="Add" + label="Wear" layout="topleft" - name="Wearable Add"> + name="Wearable Wear"> <menu_item_call.on_click function="Inventory.DoToSelected" - parameter="wear_add" /> + parameter="wear" /> </menu_item_call> <menu_item_call label="Take Off" diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 4655fa8c46..e95300a4b3 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <menu_bar - follows="left|top|right" + follows="left|top" height="18" layout="topleft" left_delta="0" diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index b6cc222e96..8b10c7b049 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -18,16 +18,16 @@ name="Edit..."> <menu_item_call.on_click function="Object.Edit" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="EnableEdit"/> </menu_item_call> <menu_item_call label="Build" name="Build"> <menu_item_call.on_click - function="Object.Build" /> - <menu_item_call.on_enable - function="EnableEdit"/> + function="Object.Edit" /> + <menu_item_call.on_visible + function="VisibleBuild"/> </menu_item_call> <menu_item_call enabled="false" @@ -44,8 +44,11 @@ name="Object Sit"> <menu_item_call.on_click function="Object.SitOrStand" /> + <menu_item_call.on_visible + function="Object.SitVisible" /> <menu_item_call.on_enable - function="Object.EnableSit" /> + function="Object.EnableSitOrStand" + name="EnableSitOrStand" /> </menu_item_call> <menu_item_call enabled="false" @@ -53,8 +56,11 @@ name="Object Stand Up"> <menu_item_call.on_click function="Object.SitOrStand" /> + <menu_item_call.on_visible + function="Object.StandUpVisible" /> <menu_item_call.on_enable - function="Object.EnableStandUp" /> + function="Object.EnableSitOrStand" + name="EnableSitOrStand" /> </menu_item_call> <menu_item_call label="Object Profile" diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 4ed5807808..2515b60868 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -6,31 +6,31 @@ label="Sort by Name" layout="topleft" name="SortByName"> - <on_check - function="ParticipantList.CheckItem" - parameter="is_sorted_by_name" /> - <on_click + <menu_item_check.on_click function="ParticipantList.Sort" parameter="sort_by_name" /> + <menu_item_check.on_check + function="ParticipantList.CheckItem" + parameter="is_sorted_by_name" /> </menu_item_check> <menu_item_check label="Sort by Recent Speakers" layout="topleft" name="SortByRecentSpeakers"> - <on_check - function="ParticipantList.CheckItem" - parameter="is_sorted_by_recent_speakers" /> - <on_click + <menu_item_check.on_click function="ParticipantList.Sort" parameter="sort_by_recent_speakers" /> + <menu_item_check.on_check + function="ParticipantList.CheckItem" + parameter="is_sorted_by_recent_speakers" /> </menu_item_check> <menu_item_call label="View Profile" layout="topleft" name="View Profile"> - <on_click + <menu_item_call.on_click function="Avatar.Profile" /> - <on_enable + <menu_item_call.on_enable function="ParticipantList.EnableItem" parameter="can_view_profile" /> </menu_item_call> @@ -38,9 +38,9 @@ label="Add Friend" layout="topleft" name="Add Friend"> - <on_click + <menu_item_call.on_click function="Avatar.AddFriend" /> - <on_enable + <menu_item_call.on_enable function="ParticipantList.EnableItem" parameter="can_add" /> </menu_item_call> @@ -48,9 +48,9 @@ label="IM" layout="topleft" name="IM"> - <on_click + <menu_item_call.on_click function="Avatar.IM" /> - <on_enable + <menu_item_call.on_enable function="ParticipantList.EnableItem" parameter="can_im" /> </menu_item_call> @@ -58,19 +58,20 @@ label="Call" layout="topleft" name="Call"> - <on_click + <menu_item_call.on_click function="Avatar.Call" /> - <on_enable + <menu_item_call.on_enable function="ParticipantList.EnableItem" parameter="can_call" /> </menu_item_call> <menu_item_call + enabled="true" label="Share" layout="topleft" name="Share"> - <on_click + <menu_item_call.on_click function="Avatar.Share" /> - <on_enable + <menu_item_call.on_enable function="ParticipantList.EnableItem" parameter="can_share" /> </menu_item_call> @@ -78,38 +79,37 @@ label="Pay" layout="topleft" name="Pay"> - <on_click + <menu_item_call.on_click function="Avatar.Pay" /> - <on_enable + <menu_item_call.on_enable function="ParticipantList.EnableItem" parameter="can_pay" /> </menu_item_call> <menu_item_separator - layout="topleft" - name="View Icons Separator" /> + layout="topleft" + name="View Icons Separator" /> <menu_item_check - label="View People Icons" - layout="topleft" - name="View Icons"> - <on_check - function="CheckControl" - parameter="ParticipantListShowIcons" /> - <on_click - function="ToggleControl" - parameter="ParticipantListShowIcons" /> + label="View People Icons" + name="View Icons"> + <on_click + function="ToggleControl" + parameter="ParticipantListShowIcons"/> + <on_check + function="CheckControl" + parameter="ParticipantListShowIcons" /> </menu_item_check> <menu_item_separator - layout="topleft" /> + layout="topleft" /> <menu_item_check label="Block Voice" layout="topleft" name="Block/Unblock"> - <on_check + <menu_item_check.on_click + function="Avatar.BlockUnblock" /> + <menu_item_check.on_check function="ParticipantList.CheckItem" parameter="is_blocked" /> - <on_click - function="Avatar.BlockUnblock" /> - <on_enable + <menu_item_check.on_enable function="ParticipantList.EnableItem" parameter="can_block" /> </menu_item_check> @@ -126,72 +126,71 @@ function="ParticipantList.EnableItem" parameter="can_mute_text" /> </menu_item_check> - <menu_item_separator - layout="topleft" - name="Moderator Options Separator"/> + <menu_item_separator + layout="topleft" /> <context_menu label="Moderator Options >" layout="topleft" - name="Moderator Options"> - <menu_item_check - label="Allow text chat" - layout="topleft" - name="AllowTextChat"> - <on_check - function="ParticipantList.CheckItem" - parameter="is_allowed_text_chat" /> - <on_click - function="ParticipantList.ToggleAllowTextChat" /> - <on_enable - function="ParticipantList.EnableItem" - parameter="can_allow_text_chat" /> - </menu_item_check> - <menu_item_separator - layout="topleft" - name="moderate_voice_separator" /> - <menu_item_call - label="Mute this participant" - layout="topleft" - name="ModerateVoiceMuteSelected"> - <on_click - function="ParticipantList.ModerateVoice" - parameter="selected" /> - <on_enable - function="ParticipantList.EnableItem.Moderate" - parameter="can_moderate_voice" /> - </menu_item_call> - <menu_item_call - label="Unmute this participant" - layout="topleft" - name="ModerateVoiceUnMuteSelected"> - <on_click - function="ParticipantList.ModerateVoice" - parameter="selected" /> - <on_enable - function="ParticipantList.EnableItem.Moderate" - parameter="can_moderate_voice" /> - </menu_item_call> - <menu_item_call - label="Mute everyone" - layout="topleft" - name="ModerateVoiceMute"> - <on_click - function="ParticipantList.ModerateVoice" - parameter="mute_all" /> - <on_enable - function="ParticipantList.EnableItem.Moderate" - parameter="can_moderate_voice" /> - </menu_item_call> - <menu_item_call - label="Unmute everyone" - layout="topleft" - name="ModerateVoiceUnmute"> - <on_click - function="ParticipantList.ModerateVoice" - parameter="unmute_all" /> - <on_enable - function="ParticipantList.EnableItem.Moderate" - parameter="can_moderate_voice" /> - </menu_item_call> + name="Moderator Options" > + <menu_item_check + label="Allow text chat" + layout="topleft" + name="AllowTextChat"> + <on_check + function="ParticipantList.CheckItem" + parameter="is_allowed_text_chat" /> + <on_click + function="ParticipantList.ToggleAllowTextChat" /> + <on_enable + function="ParticipantList.EnableItem" + parameter="can_allow_text_chat" /> + </menu_item_check> + <menu_item_separator + layout="topleft" + name="moderate_voice_separator" /> + <menu_item_call + label="Mute this participant" + layout="topleft" + name="ModerateVoiceMuteSelected"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="selected" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Mute everyone else" + layout="topleft" + name="ModerateVoiceMuteOthers"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="others" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Unmute this participant" + layout="topleft" + name="ModerateVoiceUnMuteSelected"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="selected" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> + <menu_item_call + label="Unmute everyone else" + layout="topleft" + name="ModerateVoiceUnMuteOthers"> + <on_click + function="ParticipantList.ModerateVoice" + parameter="others" /> + <on_enable + function="ParticipantList.EnableItem.Moderate" + parameter="can_moderate_voice" /> + </menu_item_call> </context_menu> </context_menu> diff --git a/indra/newview/skins/default/xui/en/menu_save_outfit.xml b/indra/newview/skins/default/xui/en/menu_save_outfit.xml index 6285bf7417..a8778df7f6 100644 --- a/indra/newview/skins/default/xui/en/menu_save_outfit.xml +++ b/indra/newview/skins/default/xui/en/menu_save_outfit.xml @@ -14,9 +14,9 @@ </menu_item_call> <menu_item_call name="save_as_new_outfit" - label="Save As"> + label="Save As New"> <menu_item_call.on_click - function="Outfit.SaveAs.Action" + function="Outfit.SaveAsNew.Action" userdata="" /> </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/mime_types.xml b/indra/newview/skins/default/xui/en/mime_types.xml index a585069faa..8e1e5ff062 100644 --- a/indra/newview/skins/default/xui/en/mime_types.xml +++ b/indra/newview/skins/default/xui/en/mime_types.xml @@ -120,7 +120,7 @@ none </widgettype> <impl> - media_plugin_webkit + media_plugin_quicktime </impl> </mimetype> <mimetype name="none/none"> @@ -130,9 +130,6 @@ <widgettype> none </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="audio/*"> <label name="audio2_label"> @@ -163,9 +160,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> <label name="vnd.secondlife.qt.legacy_label"> @@ -185,9 +179,6 @@ <widgettype> web </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/ogg"> <label name="application/ogg_label"> @@ -196,9 +187,6 @@ <widgettype> audio </widgettype> - <impl> - media_plugin_quicktime - </impl> </mimetype> <mimetype name="application/pdf"> <label name="application/pdf_label"> @@ -207,9 +195,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/postscript"> <label name="application/postscript_label"> @@ -218,9 +203,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/rtf"> <label name="application/rtf_label"> @@ -229,9 +211,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/smil"> <label name="application/smil_label"> @@ -240,9 +219,6 @@ <widgettype> movie </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/xhtml+xml"> <label name="application/xhtml+xml_label"> @@ -251,9 +227,6 @@ <widgettype> web </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/x-director"> <label name="application/x-director_label"> @@ -262,9 +235,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="audio/mid"> <label name="audio/mid_label"> diff --git a/indra/newview/skins/default/xui/en/mime_types_linux.xml b/indra/newview/skins/default/xui/en/mime_types_linux.xml index e95b371d00..4748c14554 100644 --- a/indra/newview/skins/default/xui/en/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/en/mime_types_linux.xml @@ -120,7 +120,7 @@ none </widgettype> <impl> - media_plugin_webkit + media_plugin_gstreamer </impl> </mimetype> <mimetype name="none/none"> @@ -130,9 +130,6 @@ <widgettype> none </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="audio/*"> <label name="audio2_label"> @@ -163,9 +160,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> <label name="vnd.secondlife.qt.legacy_label"> @@ -185,9 +179,6 @@ <widgettype> web </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/ogg"> <label name="application/ogg_label"> @@ -196,9 +187,6 @@ <widgettype> audio </widgettype> - <impl> - media_plugin_gstreamer - </impl> </mimetype> <mimetype name="application/pdf"> <label name="application/pdf_label"> @@ -207,9 +195,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/postscript"> <label name="application/postscript_label"> @@ -218,9 +203,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/rtf"> <label name="application/rtf_label"> @@ -229,9 +211,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/smil"> <label name="application/smil_label"> @@ -240,9 +219,6 @@ <widgettype> movie </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/xhtml+xml"> <label name="application/xhtml+xml_label"> @@ -251,9 +227,6 @@ <widgettype> web </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/x-director"> <label name="application/x-director_label"> @@ -262,9 +235,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="audio/mid"> <label name="audio/mid_label"> diff --git a/indra/newview/skins/default/xui/en/mime_types_mac.xml b/indra/newview/skins/default/xui/en/mime_types_mac.xml index 7931e55c0a..8e1e5ff062 100644 --- a/indra/newview/skins/default/xui/en/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/en/mime_types_mac.xml @@ -130,9 +130,6 @@ <widgettype> none </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="audio/*"> <label name="audio2_label"> @@ -163,9 +160,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype menu="1" name="video/vnd.secondlife.qt.legacy"> <label name="vnd.secondlife.qt.legacy_label"> @@ -185,9 +179,6 @@ <widgettype> web </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/ogg"> <label name="application/ogg_label"> @@ -196,9 +187,6 @@ <widgettype> audio </widgettype> - <impl> - media_plugin_quicktime - </impl> </mimetype> <mimetype name="application/pdf"> <label name="application/pdf_label"> @@ -207,9 +195,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/postscript"> <label name="application/postscript_label"> @@ -218,9 +203,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/rtf"> <label name="application/rtf_label"> @@ -229,9 +211,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/smil"> <label name="application/smil_label"> @@ -240,9 +219,6 @@ <widgettype> movie </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/xhtml+xml"> <label name="application/xhtml+xml_label"> @@ -251,9 +227,6 @@ <widgettype> web </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="application/x-director"> <label name="application/x-director_label"> @@ -262,9 +235,6 @@ <widgettype> image </widgettype> - <impl> - media_plugin_webkit - </impl> </mimetype> <mimetype name="audio/mid"> <label name="audio/mid_label"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index e8ba8c683d..07304eb14e 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -800,7 +800,7 @@ Insufficient funds to create classified. icon="alertmodal.tga" name="DeleteAvatarPick" type="alertmodal"> -Delete pick [PICK]? +Delete pick <nolink>[PICK]</nolink>? <usetemplate name="okcancelbuttons" notext="Cancel" @@ -3380,6 +3380,13 @@ You can click 'Change Preference' to raise your maturity Rating prefer </notification> <notification + icon="notifytip.tga" + name="PreferredMaturityChanged" + type="notifytip"> +Your maturity rating preference is now [RATING]. + </notification> + + <notification icon="alertmodal.tga" name="LandClaimAccessBlocked" type="alertmodal"> @@ -4376,6 +4383,18 @@ Uploading in-world and web site snapshots... </notification> <notification + icon="alertmodal.tga" + name="UploadConfirmation" + type="alertmodal"> +Uploading costs L$[AMOUNT]. +Do you wish to proceed? + <usetemplate + name="okcancelbuttons" + notext="Cancel" + yestext="Upload"/> + </notification> + + <notification icon="notify.tga" name="UploadPayment" type="notify"> @@ -5146,7 +5165,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you th type="offer"> [NAME_SLURL] has offered to teleport you to their location: -[MESSAGE] +[MESSAGE], ([MATURITY]) <form name="form"> <button index="0" @@ -5942,6 +5961,19 @@ Selected button can not be shown right now. The button will be shown when there is enough space for it. </notification> + <notification + icon="notifytip.tga" + name="ShareNotification" + type="notifytip"> +Drag items from inventory onto a person in the resident picker + </notification> + + <notification + icon="notifytip.tga" + name="AvatarRezNotification" + type="notifytip"> +Avatar '[NAME]' rezzed in [TIME] seconds. + </notification> <global name="UnsupportedCPU"> - Your CPU speed does not meet the minimum requirements. diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index c34a367c32..e412c491fd 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -127,6 +127,8 @@ <gesture_combo_list.combo_button pad_right="10" use_ellipses="true" /> + <gesture_combo_list.combo_list + page_lines="17" /> </gesture_combo_list> </layout_panel> <icon @@ -344,7 +346,6 @@ as for parent layout_panel (chiclet_list_panel) to resize bottom tray properly. user_resize="false"> <chiclet_im_well max_displayed_count="99" - flash_period="0.3" follows="right" height="28" layout="topleft" @@ -393,7 +394,6 @@ image_pressed_selected "Lit" + "Selected" - there are new messages and the Well min_width="37" user_resize="false"> <chiclet_notification - flash_period="0.25" follows="right" height="23" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index 76f7484c68..9e99a8ceaf 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -17,10 +17,6 @@ You don't have permission to view group owned land </panel.string> <panel.string - name="epmty_view_group_land_text"> - No entries - </panel.string> - <panel.string name="cant_view_group_accounting_text"> You don't have permission to view the group's accounting information. </panel.string> diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 01adc00e1a..a725548e61 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -201,7 +201,7 @@ height="16" name="forgot_password_text" top_pad="12" right="-10" - width="210"> + width="215"> Forgot your name or password? </text> <text @@ -213,7 +213,7 @@ height="16" name="login_help" top_pad="2" right="-10" - width="190"> + width="220"> Need help logging in? </text> <!-- <text follows="right|bottom" diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index 1b04d01abf..27d66945d9 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" + default_tab_group="1" follows="all" height="408" label="Things" @@ -61,6 +62,7 @@ left="7" name="inventory filter tabs" tab_height="30" + tab_group="1" tab_position="top" tab_min_width="100" top_pad="10" 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 2c9d7e4b6a..96c76576c0 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -22,25 +22,14 @@ width="600"/> <icon follows="all" - image_name="NavBar_BG_NoFav_Bevel" + image_name="NavBar_BG_NoFav" mouse_opaque="false" - name="bg_icon_no_fav_bevel" + name="bg_icon_no_fav" scale_image="true" visible="false" left="0" top="0" - height="60" - width="600"/> - <icon - follows="all" - image_name="NavBar_BG_NoNav_Bevel" - mouse_opaque="false" - name="bg_icon_no_nav_bevel" - scale_image="true" - visible="false" - left="0" - top="0" - height="60" + height="50" width="600"/> <panel background_visible="false" @@ -124,6 +113,10 @@ <!-- top_delta="0" --> <!-- width="168" /> --> <search_combo_box + bevel_style="none" + border_style="line" + border.border_thickness="0" + commit_on_focus_lost="false" follows="right|top" halign="right" height="23" 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 55df70eb71..184ea54fcb 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,7 @@ left="0" name="chat_bar" top="21" - width="308"> + width="310"> <line_editor border_style="line" border_thickness="1" @@ -17,7 +17,7 @@ layout="topleft" left_delta="3" left="0" - max_length="1024" + max_length="512" name="chat_box" text_pad_left="5" text_pad_right="25" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_media.xml b/indra/newview/skins/default/xui/en/panel_nearby_media.xml index 8c13ced8f3..ff2aae645b 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_media.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel + can_resize="true" + can_close="false" bg_opaque_image="Volume_Background" bg_alpha_image="Volume_Background" background_opaque="true" background_visible="true" layout="topleft" - width="328" + width="270" height="230" name="nearby_media" help_topic="nearby_media"> @@ -27,7 +29,7 @@ follows="left" tool_tip="Turn all nearby media off" left="8" - width="95" + width="66" height="22" label="Stop All"> <button.commit_callback @@ -38,7 +40,7 @@ follows="left" tool_tip="Turn all nearby media on" left_pad="4" - width="95" + width="66" height="22" label="Start All"> <button.commit_callback @@ -56,6 +58,7 @@ top_delta="0" left_pad="4" height="22" + min_width="28" width="28"> <button.commit_callback function="MediaListCtrl.GoMediaPrefs" /> @@ -104,7 +107,6 @@ follows="top|left" font="SansSerif" left="10" - name="nearby_media_title" width="100"> Nearby Media </text> @@ -115,7 +117,6 @@ font="SansSerif" top_pad="15" left="10" - name="show_text" width="40"> Show: </text> @@ -187,7 +188,6 @@ bevel_style="in" background_visible="false" follows="left|right|bottom" - name="media_controls_panel" top_pad="5" height="30" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml index c1800384a3..c77e4e8d5e 100644 --- a/indra/newview/skins/default/xui/en/panel_outfit_edit.xml +++ b/indra/newview/skins/default/xui/en/panel_outfit_edit.xml @@ -25,7 +25,25 @@ (unknown) </panel.string> + <!-- Wearables filtering strings --> + <string name="Filter.All" value="All"/> + <string name="Filter.Clothes/Body" value="Clothes/Body"/> + <string name="Filter.Objects" value="Objects"/> + <!-- + TODO remove this button. Added it temporary for QA to be able to test new edit wearable + panel (see EXT-6564) + --> + <button + follows="left|top|right" + height="20" + label="edit" + left="0" + top="0" + layout="topleft" + name="edit_wearable_btn" + width="40" /> + <button follows="top|left" height="23" @@ -155,7 +173,7 @@ name="look_item_sort" /> </scroll_list> - <panel + <panel background_visible="true" bevel_style="none" follows="bottom|left|right" @@ -211,7 +229,7 @@ image_selected="Toolbar_Middle_Selected" image_unselected="Toolbar_Middle_Off" layout="topleft" - name="trash_btn" + name="remove_from_outfit_btn" right="-1" top="1" width="31" /> @@ -222,29 +240,18 @@ <layout_panel auto_resize="true" default_tab_group="3" - height="250" - min_height="120" + height="210" + min_height="210" name="add_wearables_panel" width="300" tab_group="2" user_resize="true" visible="false"> - <text - follows="top|left|right" - font="SansSerifBold" - height="13" - layout="topleft" - left="5" - name="status" - text_color="LtGray" - top="5" - value="Add Wearables" - use_ellipses="true" - width="275" /> - + <!-- *NOTE is not used, invisible and disabled --> <filter_editor background_image="TextField_Search_Off" + enabled="false" follows="left|top|right" font="SansSerif" label="Filter" @@ -254,13 +261,79 @@ height="20" name="look_item_filter" text_color="black" - text_pad_left="25" /> + text_pad_left="25" + visible="false"/> + + <layout_stack + animate="true" + follows="all" + height="25" + width="300" + layout="topleft" + orientation="horizontal" + name="filter_panels" + top="0" + left="0"> + <layout_panel + layout="topleft" + follows="left|top|right" + height="25" + label="IM Control Panel" + name="filter_button_panel" + width="150" + auto_resize="true" + user_resize="false"> + <text + follows="top|left|right" + font="SansSerifBold" + height="13" + layout="topleft" + left="5" + name="add_to_outfit_label" + text_color="LtGray" + top="3" + value="Add to Outfit:" + use_ellipses="true" + width="270" /> + <button + follows="top|right" + height="20" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + is_toggle="true" + label="O" + layout="topleft" + right="-1" + name="filter_button" + top="3" + width="20" /> + </layout_panel> + <layout_panel + auto_resize="true" + height="25" + min_width="130" + name="filter_combobox_panel" + width="150" + user_resize="false" + visible="false"> + <combo_box + follows="top|left|right" + height="20" + layout="topleft" + right="-5" + name="filter_wearables_combobox" + top="0" + width="130"/> + </layout_panel> + </layout_stack> <inventory_panel - allow_multi_select="true" + allow_multi_select="false" border="false" follows="left|top|right|bottom" - height="176" + height="155" layout="topleft" left="0" mouse_opaque="false" @@ -317,6 +390,19 @@ name="list_view_btn" top="1" width="31" /> + <button + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" + label="" + layout="topleft" + left_pad="1" + name="add_to_outfit_btn" + top="1" + width="31" /> </panel> </layout_panel> </layout_stack> @@ -338,6 +424,19 @@ name="save_btn" width="145" /> <button + follows="bottom|right" + height="23" + name="save_flyout_btn" + label="" + left_pad="-20" + tab_stop="false" + image_selected="SegmentedBtn_Right_Selected_Press" + image_unselected="SegmentedBtn_Right_Off" + image_pressed="SegmentedBtn_Right_Press" + image_pressed_selected="SegmentedBtn_Right_Selected_Press" + image_overlay="Arrow_Small_Up" + width="20"/> + <button follows="bottom|left|right" height="23" left_pad="15" diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 6152dd1587..61784fede4 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Side tray panel --> <panel + default_tab_group="1" follows="all" height="449" label="People" @@ -11,11 +12,17 @@ top="0" width="333"> <string - name="no_people" - value="No people" /> + name="no_recent_people" + value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> + <string + name="no_filtered_recent_people" + value="Didn't find what you're looking for? Try [secondlife:///app/search/people Search]." /> <string name="no_one_near" - value="No one near" /> + value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." /> + <string + name="no_one_filtered_near" + value="Didn't find what you're looking for? Try [secondlife:///app/search/people Search]." /> <string name="no_friends_online" value="No friends online" /> @@ -29,15 +36,15 @@ name="groups_filter_label" value="Filter Groups" /> <!-- - *WORKAROUND: for group_list.no_groups_msg & group_list.no_filtered_groups_msg attributes. + *WORKAROUND: for group_list.no_items_msg & group_list.no_filtered_items_msg attributes. They are not defined as translatable in VLT. See EXT-5931 --> <string name="no_filtered_groups_msg" - value="[secondlife:///app/search/groups Try finding the group in search?]" /> + value="Didn't find what you're looking for? Try [secondlife:///app/search/groups Search]." /> <string name="no_groups_msg" - value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> + value="Looking for Groups to join? Try [secondlife:///app/search/groups Search]." /> <filter_editor follows="left|top|right" height="23" @@ -56,6 +63,7 @@ layout="topleft" left="5" name="tabs" + tab_group="1" tab_min_width="70" tab_height="30" tab_position="top" @@ -262,8 +270,8 @@ top="10" width="293" wrap="true"> - To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend. -If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map]. + Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend. +Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map]. </text> </panel> <panel diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml index a43b244fa0..9725e9952a 100644 --- a/indra/newview/skins/default/xui/en/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml @@ -321,6 +321,7 @@ follows="all" height="223" layout="topleft" + single_expansion="true" left="0" name="advanced_info_accordion" top_pad="10" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index c61007a9e1..a7a0efcdb3 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" + default_tab_group="1" follows="all" height="570" label="Places" @@ -37,6 +38,7 @@ background_visible="true" name="Places Tabs" tab_min_width="80" tab_height="30" + tab_group="1" tab_position="top" top_pad="10" width="315" /> @@ -132,5 +134,14 @@ background_visible="true" right="-10" top="1" width="60" /> + <button + follows="bottom|left" + height="23" + label="Profile" + layout="topleft" + name="profile_btn" + right="-1" + top="1" + width="111" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml index ba967d3e2c..3ef16d2dec 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml @@ -330,7 +330,7 @@ <check_box enabled="false" height="16" - label="Enable plain text IM and chat history" + label="Enable plain text chat history" layout="topleft" left_delta="0" name="plain_text_chat_history" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 9e48f11de5..68a0db3b89 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -324,21 +324,21 @@ increment="8" initial_value="160" label="Draw distance:" - label_width="140" + label_width="185" layout="topleft" - left="216" + left="200" max_val="512" min_val="64" name="DrawDistance" top="3" - width="255" /> + width="296" /> <text type="string" length="1" follows="left|top" height="12" layout="topleft" - left_delta="250" + left_delta="291" name="DrawDistanceMeterText2" top_delta="0" width="128"> @@ -352,13 +352,13 @@ increment="256" initial_value="4096" label="Max. particle count:" - label_width="140" + label_width="185" layout="topleft" - left="216" + left="200" max_val="8192" name="MaxParticleCount" top_pad="7" - width="262" /> + width="303" /> <slider control_name="RenderGlowResolutionPow" decimal_digits="0" @@ -367,7 +367,7 @@ increment="1" initial_value="8" label="Post process quality:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="9" @@ -375,7 +375,7 @@ name="RenderPostProcess" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="PostProcessText" /> @@ -399,14 +399,14 @@ increment="0.125" initial_value="160" label=" Objects:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="2" name="ObjectMeshDetail" show_text="false" top_pad="6" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="ObjectMeshDetailText" /> @@ -417,13 +417,13 @@ height="16" initial_value="160" label=" Flexiprims:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" name="FlexibleMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="FlexibleMeshDetailText" /> @@ -435,13 +435,13 @@ increment="0.125" initial_value="160" label=" Trees:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" name="TreeMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="TreeMeshDetailText" /> @@ -453,13 +453,13 @@ increment="0.125" initial_value="160" label=" Avatars:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" name="AvatarMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="AvatarMeshDetailText" /> @@ -471,7 +471,7 @@ increment="0.125" initial_value="160" label=" Terrain:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="2" @@ -479,7 +479,7 @@ name="TerrainMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="TerrainMeshDetailText" /> @@ -493,7 +493,7 @@ increment="8" initial_value="160" label=" Sky:" - label_width="140" + label_width="185" layout="topleft" left_delta="0" max_val="128" @@ -501,7 +501,7 @@ name="SkyMeshDetail" show_text="false" top_pad="4" - width="223"> + width="264"> <slider.commit_callback function="Pref.UpdateSliderText" parameter="SkyMeshDetailText" /> @@ -512,7 +512,7 @@ follows="left|top" height="12" layout="topleft" - left="444" + left="469" name="PostProcessText" top="328" width="128"> @@ -597,7 +597,7 @@ follows="left|top" height="12" layout="topleft" - left_delta="-230" + left_delta="-260" name="AvatarRenderingText" top_pad="8" width="128"> @@ -643,6 +643,7 @@ height="12" layout="topleft" left="358" + left_pad="-30" name="TerrainDetailText" top="488" width="155"> @@ -656,23 +657,21 @@ left_delta="0" name="TerrainDetailRadio" top_pad="5" - width="321"> + width="70"> <radio_item height="16" label="Low" layout="topleft" - left="3" name="0" top="3" - width="315" /> + width="50" /> <radio_item height="16" label="High" layout="topleft" - left_delta="0" name="2" top_delta="16" - width="315" /> + width="50" /> </radio_group> --> </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 4ebd4c76f8..fca9b4bca1 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -162,9 +162,8 @@ name="block_list" top_pad="20" width="145"> - <!--<button.commit_callback - function="SideTray.ShowPanel"--> - <button.commit_callback - function="Pref.BlockList"/> + <button.commit_callback + function="SideTray.ShowPanel" + parameter="panel_block_list_sidetray" /> </button> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml index f9c86fc75b..19eb4bb0d6 100644 --- a/indra/newview/skins/default/xui/en/panel_scrolling_param.xml +++ b/indra/newview/skins/default/xui/en/panel_scrolling_param.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel - height="152" + height="157" layout="topleft" left="0" name="LLScrollingPanelParam" @@ -10,25 +10,25 @@ follows="left|top" height="16" layout="topleft" - left="4" + left="12" name="min param text" - top="116" - width="128" /> + top="120" + width="120" /> <text follows="left|top" height="16" layout="topleft" - left_pad="6" + left="155" name="max param text" top_delta="0" - width="128" /> + width="120" /> <text type="string" length="1" follows="left|top" height="16" layout="topleft" - left="8" + left="12" name="Loading..." top="11" width="128"> @@ -40,7 +40,7 @@ follows="left|top" height="16" layout="topleft" - left_pad="6" + left="155" name="Loading...2" top_delta="0" width="128"> @@ -49,30 +49,30 @@ <view_border layout="topleft" follows="left|top" - left="2" - top="0" + left="7" + top="5" width="132" height="132" thickness="2" - shadow_light_color="LtGray_50" - highlight_light_color="LtGray_50" - highlight_dark_color="LtGray_50" - shadow_dark_color="LtGray_50" + shadow_light_color="0.3 0.3 0.3 1" + highlight_light_color="0.3 0.3 0.3 1" + highlight_dark_color="0.3 0.3 0.3 1" + shadow_dark_color="0.3 0.3 0.3 1" bevel_style="in" name="left_border" /> <view_border layout="topleft" follows="left|top" - left_pad="2" + left_pad="10" top_delta="0" width="132" height="132" thickness="2" - shadow_light_color="LtGray_50" - highlight_light_color="LtGray_50" - highlight_dark_color="LtGray_50" - shadow_dark_color="LtGray_50" + shadow_light_color="0.3 0.3 0.3 1" + highlight_light_color="0.3 0.3 0.3 1" + highlight_dark_color="0.3 0.3 0.3 1" + shadow_dark_color="0.3 0.3 0.3 1" bevel_style="in" name="right_border" /> @@ -84,10 +84,10 @@ image_selected="PushButton_Selected" image_unselected="PushButton_Off" layout="topleft" - left="2" + left="7" name="less" tab_stop="false" - top="0" + top="5" width="132" /> <button enabled="false" @@ -97,7 +97,7 @@ image_selected="PushButton_Selected" image_unselected="PushButton_Off" layout="topleft" - left_pad="2" + left_pad="10" name="more" tab_stop="false" top_delta="0" @@ -110,11 +110,11 @@ increment="1" initial_value="0" label="[DESC]" - label_width="100" - layout="topleft" + layout="bottom|left" left="6" max_val="100" name="param slider" - top="134" - width="258" /> + bottom="1" + width="274" + slider_label.font.style="BOLD" /> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index c2624ce0d0..690d2971ee 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -99,7 +99,7 @@ image_pressed="Pause_Press" image_pressed_selected="Play_Press" is_toggle="true" - left_pad="20" + left_pad="15" top="1" name="media_toggle_btn" tool_tip="Start/Stop All Media (Music, Video, Web pages)" @@ -112,12 +112,12 @@ image_pressed="Audio_Press" image_unselected="Audio_Off" is_toggle="true" - left_pad="10" + left_pad="5" top="2" name="volume_btn" tool_tip="Global Volume Control" width="16" /> - <!-- <text + <text follows="right|top" halign="center" height="12" @@ -125,5 +125,5 @@ left_delta="0" name="stat_btn" top_delta="0" - width="20"/>--> + width="20"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml index 42f64c3a76..92b4c17247 100644 --- a/indra/newview/skins/default/xui/en/panel_toast.xml +++ b/indra/newview/skins/default/xui/en/panel_toast.xml @@ -31,6 +31,8 @@ can_close="false" can_dock="false" border_visible = "false" + border_drop_shadow_visible = "false" + drop_shadow_visible = "false" border = "false" > <panel diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index c5efa2e221..73650a19dc 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel background_visible="true" +default_tab_group="1" follows="all" height="570" label="Outfits" @@ -90,6 +91,7 @@ width="333"> min_height="410" width="320" left="0" + tab_group="1" top_pad="6" follows="all" /> <!-- <button diff --git a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml index 6c9acae35e..812d94c55f 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_inventory.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_inventory.xml @@ -45,7 +45,6 @@ layout="topleft" left="0" name="info_btn" - tool_tip="Show object profile" top="0" width="102" /> <button @@ -56,18 +55,6 @@ layout="topleft" left="105" name="share_btn" - tool_tip="Share an inventory item" - top="0" - width="102" /> - <button - enabled="true" - follows="bottom|left" - height="23" - label="Shop" - layout="topleft" - left="210" - name="shop_btn" - tool_tip="Open Marketplace webpage" top="0" width="102" /> <button @@ -78,7 +65,6 @@ layout="topleft" left="210" name="wear_btn" - tool_tip="Wear seleceted outfit" top="0" width="102" /> <button @@ -99,7 +85,6 @@ layout="topleft" left="210" name="teleport_btn" - tool_tip="Teleport to the selected area" top="0" width="102" /> </panel> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0c73b8d769..80fddcba43 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -148,6 +148,8 @@ <!-- Group name: text shown for LLUUID::null --> <string name="GroupNameNone">(none)</string> + <string name="AvalineCaller">Avaline Caller [ORDER]</string> + <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. --> <string name="AssetErrorNone">No error</string> <string name="AssetErrorRequestFailed">Asset request: failed</string> @@ -2154,7 +2156,7 @@ Clears (deletes) the media and all params from the given face. <!-- Region/Estate Covenant --> <string name="RegionNoCovenant">There is no Covenant provided for this Estate.</string> <string name="RegionNoCovenantOtherOwner">There is no Covenant provided for this Estate. The land on this estate is being sold by the Estate owner, not Linden Lab. Please contact the Estate Owner for sales details.</string> - <string name="covenant_last_modified">Last Modified:</string> + <string name="covenant_last_modified" value="Last Modified: " /> <!-- use value="" to keep the trailing space --> <string name="none_text" value=" (none) " /> <string name="never_text" value=" (never) " /> @@ -2940,6 +2942,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <string name="IM_moderator_label">(Moderator)</string> <!-- voice calls --> + <string name="answered_call">Your call has been answered</string> <string name="started_call">Started a voice call</string> <string name="joined_call">Joined the voice call</string> @@ -3056,6 +3059,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. <!-- Financial operations strings --> <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string> <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string> + <string name="you_paid_ldollars_no_info">You paid L$[AMOUNT].</string> <string name="you_paid_ldollars_no_reason">You paid [NAME] L$[AMOUNT].</string> <string name="you_paid_ldollars_no_name">You paid L$[AMOUNT] [REASON].</string> <string name="for a parcel of land">for a parcel of land</string> @@ -3099,4 +3103,11 @@ Abuse Report</string> <string name="New Script">New Script</string> <string name="New Folder">New Folder</string> <string name="Contents">Contents</string> -</strings> + + <!-- birth date format shared by avatar inspector and profile panels --> + <string name="AvatarBirthDateFormat">[mthnum,datetime,slt]/[day,datetime,slt]/[year,datetime,slt]</string> + + <string name="DefaultMimeType">none/none</string> + <string name="texture_load_dimensions_error">Can't load images larger than [WIDTH]*[HEIGHT]</string> + + </strings> |