diff options
Diffstat (limited to 'indra/newview/skins/minimal/xui')
8 files changed, 290 insertions, 55 deletions
diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml index e9dd962b28..4cf792444f 100644 --- a/indra/newview/skins/minimal/xui/en/floater_camera.xml +++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml @@ -245,7 +245,7 @@ </joystick_track> </panel> </panel> - <panel + <panel border="false" height="42" layout="topleft" @@ -280,5 +280,5 @@ tool_tip="Orbit Zoom Pan" width="25"> </button> - </panel> + </panel> </floater> diff --git a/indra/newview/skins/minimal/xui/en/inspect_object.xml b/indra/newview/skins/minimal/xui/en/inspect_object.xml index 8d14c974b4..a5b03a2f58 100644 --- a/indra/newview/skins/minimal/xui/en/inspect_object.xml +++ b/indra/newview/skins/minimal/xui/en/inspect_object.xml @@ -148,17 +148,7 @@ L$30,000 width="80" /> <!-- non-overlapping buttons here --> - <button - follows="top|left" - height="20" - label="More" - layout="topleft" - name="more_info_btn" - left_pad="10" - top_delta="0" - tab_stop="false" - width="80" /> - <menu_button + <menu_button follows="top|left" height="20" image_overlay="OptionsMenu_Off" diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml index a2c16fc9e2..45ba785c1f 100644 --- a/indra/newview/skins/minimal/xui/en/main_view.xml +++ b/indra/newview/skins/minimal/xui/en/main_view.xml @@ -131,13 +131,13 @@ name="bottom_tray_container" visible="false"/> <layout_panel auto_resize="false" - height="200" + height="215" mouse_opaque="false" user_resize="false" name="avatar_picker_and_destination_guide_container" visible="false"> <panel top="0" - height="200" + height="215" left="0" background_visible="true" width="500" @@ -148,16 +148,14 @@ follows="all" name="destination_guide_contents" trusted_content="true" - visible="false" - start_url="http://interest.secondlife/viewer/guide"/> + visible="false"/> <web_browser top="0" height="200" follows="all" name="avatar_picker_contents" visible="false" - trusted_content="true" - start_url="http://interest.secondlife/viewer/avatar"/> + trusted_content="true"/> <button name="close" width="22" diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml index 28c4762eaa..5a4a059781 100644 --- a/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/minimal/xui/en/menu_inspect_avatar_gear.xml @@ -1,2 +1,116 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toggleable_menu/> +<?xml version="1.0" encoding="utf-8"?> +<toggleable_menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="View Profile" + enabled="true" + name="view_profile"> + <menu_item_call.on_click + function="InspectAvatar.ViewProfile"/> + </menu_item_call> + <menu_item_call + label="Add Friend" + name="add_friend"> + <menu_item_call.on_click + function="InspectAvatar.AddFriend"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.Enable"/> + </menu_item_call> + <menu_item_call + label="IM" + name="im"> + <menu_item_call.on_click + function="InspectAvatar.IM"/> + </menu_item_call> + <menu_item_call + label="Teleport" + name="teleport"> + <menu_item_call.on_click + function="InspectAvatar.Teleport"/> + <menu_item_call.on_enable + function="InspectAvatar.Gear.EnableTeleportOffer"/> + </menu_item_call> + <menu_item_separator /> + <menu_item_call + label="Block" + name="block"> + <menu_item_call.on_click + function="InspectAvatar.ToggleMute"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Unblock" + name="unblock"> + <menu_item_call.on_click + function="InspectAvatar.ToggleMute"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableUnmute" /> + </menu_item_call> + <menu_item_call + label="Report" + name="report"> + <menu_item_call.on_click + function="InspectAvatar.Report"/> + </menu_item_call> + <menu_item_call + label="Freeze" + name="freeze"> + <menu_item_call.on_click + function="InspectAvatar.Freeze"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFreeze"/> + </menu_item_call> + <menu_item_call + label="Eject" + name="eject"> + <menu_item_call.on_click + function="InspectAvatar.Eject"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleEject"/> + </menu_item_call> + <menu_item_call + label="Kick" + name="kick"> + <menu_item_call.on_click + function="InspectAvatar.Kick"/> + <menu_item_call.on_visible + function="InspectAvatar.EnableGod"/> + </menu_item_call> + <menu_item_call + label="CSR" + name="csr"> + <menu_item_call.on_click + function="InspectAvatar.CSR" /> + <menu_item_call.on_visible + function="InspectAvatar.EnableGod" /> + </menu_item_call> + <menu_item_call + label="Debug Textures" + name="debug"> + <menu_item_call.on_click + function="Avatar.Debug"/> + <menu_item_call.on_visible + function="IsGodCustomerService"/> + </menu_item_call> + <menu_item_call + label="Find On Map" + name="find_on_map"> + <menu_item_call.on_click + function="InspectAvatar.FindOnMap"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleFindOnMap"/> + </menu_item_call> + <menu_item_call + label="Zoom In" + name="zoom_in"> + <menu_item_call.on_click + function="InspectAvatar.ZoomIn"/> + <menu_item_call.on_visible + function="InspectAvatar.VisibleZoomIn"/> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml index 28c4762eaa..6a1b1d8fc7 100644 --- a/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml +++ b/indra/newview/skins/minimal/xui/en/menu_inspect_object_gear.xml @@ -1,2 +1,114 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<toggleable_menu/> +<?xml version="1.0" encoding="utf-8"?> +<toggleable_menu + create_jump_keys="true" + layout="topleft" + mouse_opaque="false" + visible="false" + name="Gear Menu"> + <menu_item_call + label="Touch" + layout="topleft" + enabled="true" + name="touch"> + <menu_item_call.on_click + function="InspectObject.Touch"/> + <menu_item_call.on_visible + function="Object.EnableTouch" /> + </menu_item_call> + <menu_item_call + label="Sit" + layout="topleft" + name="sit"> + <menu_item_call.on_click + function="InspectObject.Sit"/> + <menu_item_call.on_visible + function="Object.EnableSit"/> + </menu_item_call> + <menu_item_call + label="Pay" + layout="topleft" + name="pay"> + <menu_item_call.on_click + function="InspectObject.Pay"/> + <menu_item_call.on_visible + function="EnablePayObject" /> + </menu_item_call> + <menu_item_call + label="Buy" + layout="topleft" + enabled="true" + name="buy"> + <menu_item_call.on_click + function="InspectObject.Buy"/> + <menu_item_call.on_visible + function="Object.VisibleBuy" /> + </menu_item_call> + <menu_item_call + label="Take Copy" + layout="topleft" + name="take_copy"> + <menu_item_call.on_click + function="InspectObject.TakeFreeCopy"/> + <menu_item_call.on_visible + function="Tools.EnableTakeCopy"/> + </menu_item_call> + <menu_item_call + label="Open" + layout="topleft" + name="open"> + <menu_item_call.on_click + function="InspectObject.Open"/> + <menu_item_call.on_visible + function="Object.EnableOpen" /> + </menu_item_call> + <menu_item_call + label="Wear" + layout="topleft" + name="wear"> + <menu_item_call.on_click + function="Object.AttachToAvatar" /> + <menu_item_call.on_visible + function="Object.EnableWear" /> + </menu_item_call> + <menu_item_call + label="Add" + layout="topleft" + name="add"> + <menu_item_call.on_click + function="Object.AttachAddToAvatar" /> + <menu_item_call.on_visible + function="Object.EnableWear" /> + </menu_item_call> + <menu_item_call + label="Report" + layout="topleft" + name="report"> + <menu_item_call.on_click + function="Object.ReportAbuse" /> + </menu_item_call> + <menu_item_call + label="Block" + layout="topleft" + name="block"> + <menu_item_call.on_click + function="Object.Mute" /> + <menu_item_call.on_visible + function="Object.EnableMute" /> + </menu_item_call> + <menu_item_call + label="Zoom In" + layout="topleft" + name="zoom_in"> + <menu_item_call.on_click + function="InspectObject.ZoomIn" /> + </menu_item_call> + <menu_item_call + label="Remove" + layout="topleft" + name="remove"> + <menu_item_call.on_click + function="Object.Delete" /> + <menu_item_call.on_visible + function="Object.EnableDelete" /> + </menu_item_call> +</toggleable_menu> diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml index ee6a9f0b02..e05430636c 100644 --- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml +++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml @@ -1,28 +1,28 @@ <?xml version="1.0" ?> <notification_visibility> <respond name="UserGiveItem" response="Discard"/> - <respond name="JoinGroup" response="Decline"/> + <respond name="ObjectGiveItem" response="Discard"/> <respond name="VoiceInviteP2P" response="Decline"/> <respond name="VoiceInviteAdHoc" response="Decline"/> - <respond name="ObjectGiveItem" response="Discard"/> <respond name="VoiceInviteGroup" response="Decline"/> + + <!-- group and voice are disabled features --> + <hide tag="group"/> + <hide tag="voice"/> + + <!-- refers to preferences --> + <hide name="RegionEntryAccessBlocked"/> + + <!-- hints pertaining to UI we don't show --> + <hide name="FirstBalanceIncrease"/> + <hide name="FirstInventory"/> + <hide name="HintSidePanel"/> + <hide name="HintMove"/> + <hide name="HintDisplayName"/> <hide name="HintInventory"/> <hide name="HintLindenDollar"/> - <hide name="HintMove"/> - <hide name="ClothingLoading"/> - <hide name="LandBuyPass"/> - <hide tag="voice"/> - <show name="RegionRestartMinutes"/> - <show name="RegionRestartSeconds"/> - <show name="PopupAttempt"/> - <show tag="confirm"/> - <show tag="friendship"/> - <show tag="fail"/> - <show tag="funds"/> - <show type="hint"/> - <show type="notifytoast"/> - <show name="ModeChange"/> - <show name="YouHaveBeenLoggedOut"/> - <hide/> + + <!-- show everything else --> + <show/> </notification_visibility> diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml index 2caa8ad903..ccecdd9ece 100644 --- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml @@ -281,7 +281,40 @@ parameter="agent"/> </bottomtray_button> </layout_panel> - <layout_panel + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="65" + mouse_opaque="false" + name="howto_panel" + top_delta="0" + user_resize="false" + width="105"> + <bottomtray_button + can_drag="false" + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + label="How To" + layout="topleft" + left="0" + name="show_help_btn" + tool_tip="Open Second Life How To topics" + is_toggle="true" + top="5" + use_ellipses="true" + width="100"> + <bottomtray_button.commit_callback + function="ToggleHelp" + parameter="f1_help" /> + </bottomtray_button> + </layout_panel> + <layout_panel follows="left|right" height="30" layout="topleft" diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml index cd21242edc..6dc1a1c9b0 100644 --- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml @@ -63,7 +63,7 @@ width="31" /> mouse_opaque="false" name="location_combo" top_delta="0" - width="360"> + width="440"> </location_input> <icon follows="right" height="20" @@ -72,17 +72,5 @@ width="31" /> image_name="Button_Separator" name="separator" top="2"/> - <button - right="-70" - top="2" - width="80" - height="22" - label="How To" - follows="top|right" - name="skylight_help"> - <commit_callback - function="ShowHelp" - parameter="f1_help" /> - </button> </panel> </panel> |