diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 29 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index 614a2e2ffe..74eafb24db 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -46,8 +46,8 @@ top="0" width="314" mouse_opaque="true" - name="outfitslist_accordionpanel" - start_folder="My Outfits" /> + name="outfitslist_tab" + start_folder="My Outfits" /> </tab_container> <panel background_visible="true" @@ -82,10 +82,10 @@ tool_tip="Remove selected item" top="6" width="18" /> - <button - follows="bottom|left" - height="23" - label="Make Outfit" + <button + follows="bottom|left" + height="23" + label="Make Outfit" layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" @@ -93,8 +93,8 @@ left='10' width="120" /> <button - follows="bottom|right" - height="23" + follows="bottom|right" + height="23" label="Wear" layout="topleft" name="wear_btn" 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 25d7ba0903..5dd93d0f7e 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -85,7 +85,10 @@ left="30" name="autoplay_enabled" top_pad="10" - width="350" /> + width="350"> + <check_box.commit_callback + function="Pref.ParcelMediaAutoPlayEnable" /> + </check_box> <text type="string" length="1" diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml index 4cef1f9c60..075d9232b1 100644 --- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml @@ -14,7 +14,7 @@ <string name="min_width">300</string> <string name="min_height">75</string> <string name="zoom_near_padding">1.0</string> - <string name="zoom_medium_padding">1.25</string> + <string name="zoom_medium_padding">1.1</string> <string name="zoom_far_padding">1.5</string> <string name="top_world_view_avoid_zone">50</string> <layout_stack @@ -113,6 +113,7 @@ </layout_panel> <layout_panel name="fwd" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -140,6 +141,7 @@ </layout_panel> <layout_panel name="home" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -167,6 +169,7 @@ </layout_panel> <layout_panel name="media_stop" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -194,6 +197,7 @@ </layout_panel> <layout_panel name="reload" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -221,6 +225,7 @@ </layout_panel> <layout_panel name="stop" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -248,6 +253,7 @@ </layout_panel> <layout_panel name="play" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -276,6 +282,7 @@ </layout_panel> <layout_panel name="pause" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -303,6 +310,7 @@ <!-- media URL entry --> <layout_panel name="media_address" + mouse_opaque="false" auto_resize="true" user_resize="false" height="24" @@ -367,6 +375,7 @@ </layout_panel> <layout_panel name="media_play_position" + mouse_opaque="false" auto_resize="true" user_resize="false" follows="left|right" @@ -392,6 +401,7 @@ </layout_panel> <layout_panel name="skip_back" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -419,6 +429,7 @@ </layout_panel> <layout_panel name="skip_forward" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -445,6 +456,7 @@ </layout_panel> <layout_panel name="media_volume" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -501,6 +513,7 @@ </layout_panel> <layout_panel name="zoom_frame" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -528,6 +541,7 @@ </layout_panel> <layout_panel name="close" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -554,6 +568,7 @@ </layout_panel> <layout_panel name="new_window" + mouse_opaque="false" auto_resize="false" user_resize="false" layout="topleft" @@ -581,6 +596,7 @@ <!-- bookend panel --> <layout_panel name="right_bookend" + mouse_opaque="false" top="0" width="0" layout="topleft" |