diff options
Diffstat (limited to 'indra/newview/skins/minimal/xui/en')
7 files changed, 84 insertions, 256 deletions
diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml index 76d1b97cab..4cf792444f 100644 --- a/indra/newview/skins/minimal/xui/en/floater_camera.xml +++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml @@ -253,21 +253,21 @@ top_pad="0" name="buttons" width="226"> - <button + <button height="23" label="" layout="topleft" - left="70" + left="83" is_toggle="true" image_overlay="Cam_Avatar_Off" image_selected="PushButton_Selected_Press" name="presets_btn" tab_stop="false" tool_tip="Preset Views" - top="13" + top="13" width="25"> - </button> - <button + </button> + <button height="23" label="" layout="topleft" @@ -279,18 +279,6 @@ tab_stop="false" tool_tip="Orbit Zoom Pan" width="25"> - </button> - <button - height="23" - label="" - layout="topleft" - left_pad="1" - image_overlay="Cam_FreeCam_Off" - image_selected="PushButton_Selected_Press" - name="avatarview_btn" - tab_stop="false" - tool_tip="Camera modes" - width="25"> - </button> + </button> </panel> </floater> diff --git a/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml b/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml index fb19c5eb2c..542a7dc7dc 100644 --- a/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml +++ b/indra/newview/skins/minimal/xui/en/menu_attachment_self.xml @@ -1,2 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<context_menu/> +<context_menu + layout="topleft" + name="Attachment Pie"> + <menu_item_call + enabled="false" + label="Touch" + layout="topleft" + name="Attachment Object Touch"> + <menu_item_call.on_click + function="Object.Touch" /> + <menu_item_call.on_enable + function="Object.EnableTouch" + name="EnableTouch"/> + </menu_item_call> + <menu_item_call + enabled="false" + label="Detach" + layout="topleft" + name="Detach"> + <menu_item_call.on_click + function="Attachment.Detach" /> + <menu_item_call.on_enable + function="Attachment.EnableDetach" /> + </menu_item_call> +</context_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 6a1b1d8fc7..8ec360a604 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 @@ -25,61 +25,6 @@ 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"> @@ -102,13 +47,4 @@ <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/menu_inspect_self_gear.xml b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml index ed3b75342f..ae8b640d26 100644 --- a/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml +++ b/indra/newview/skins/minimal/xui/en/menu_inspect_self_gear.xml @@ -22,176 +22,6 @@ <menu_item_call.on_enable function="Self.EnableStandUp" /> </menu_item_call> - <context_menu - label="Take Off" - layout="topleft" - name="Take Off >"> - <context_menu - label="Clothes" - layout="topleft" - name="Clothes >"> - <menu_item_call - enabled="false" - label="Shirt" - layout="topleft" - name="Shirt"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="shirt" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="shirt" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Pants" - layout="topleft" - name="Pants"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="pants" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="pants" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Skirt" - layout="topleft" - name="Skirt"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="skirt" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="skirt" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Shoes" - layout="topleft" - name="Shoes"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="shoes" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="shoes" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Socks" - layout="topleft" - name="Socks"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="socks" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="socks" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Jacket" - layout="topleft" - name="Jacket"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="jacket" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="jacket" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Gloves" - layout="topleft" - name="Gloves"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="gloves" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="gloves" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Undershirt" - layout="topleft" - name="Self Undershirt"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="undershirt" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="undershirt" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Underpants" - layout="topleft" - name="Self Underpants"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="underpants" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="underpants" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Tattoo" - layout="topleft" - name="Self Tattoo"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="tattoo" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="tattoo" /> - </menu_item_call> - <menu_item_call - enabled="false" - label="Alpha" - layout="topleft" - name="Self Alpha"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="alpha" /> - <menu_item_call.on_enable - function="Edit.EnableTakeOff" - parameter="alpha" /> - </menu_item_call> - <menu_item_separator - layout="topleft" /> - <menu_item_call - label="All Clothes" - layout="topleft" - name="All Clothes"> - <menu_item_call.on_click - function="Edit.TakeOff" - parameter="all" /> - </menu_item_call> - </context_menu> - <context_menu - label="HUD" - layout="topleft" - name="Object Detach HUD" /> - <context_menu - label="Detach" - layout="topleft" - name="Object Detach" /> - <menu_item_call - label="Detach All" - layout="topleft" - name="Detach All"> - <menu_item_call.on_click - function="Self.RemoveAllAttachments" - parameter="" /> - <menu_item_call.on_enable - function="Self.EnableRemoveAllAttachments" /> - </menu_item_call> - </context_menu> <menu_item_call label="My Friends" layout="topleft" diff --git a/indra/newview/skins/minimal/xui/en/notification_visibility.xml b/indra/newview/skins/minimal/xui/en/notification_visibility.xml index 631cf5d42c..9d4836d328 100644 --- a/indra/newview/skins/minimal/xui/en/notification_visibility.xml +++ b/indra/newview/skins/minimal/xui/en/notification_visibility.xml @@ -10,8 +10,8 @@ <hide tag="group"/> <hide tag="voice"/> - <!-- refers to preferences --> - <hide name="RegionEntryAccessBlocked_Change"/> + <!-- no spammy scripts --> + <!-- <hide name="ScriptDialog"/> --> <!-- hints pertaining to UI we don't show --> <hide name="FirstBalanceIncrease"/> @@ -22,6 +22,9 @@ <hide name="HintInventory"/> <hide name="HintLindenDollar"/> + <!-- spam from servers, such as "Autopilot cancelled" --> + <hide name="SystemMessageTip"/> + <!-- show everything else --> <show/> </notification_visibility> diff --git a/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml new file mode 100644 index 0000000000..5730adab8a --- /dev/null +++ b/indra/newview/skins/minimal/xui/en/panel_adhoc_control_panel.xml @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<panel + border="false" + follows="all" + height="215" + name="panel_im_control_panel" + width="150"> + <layout_stack + mouse_opaque="false" + border_size="0" + clip="false" + follows="all" + height="215" + layout="topleft" + left="3" + name="vertical_stack" + orientation="vertical" + top="0" + width="147"> + <layout_panel + auto_resize="true" + follows="top|left" + height="130" + layout="topleft" + left="0" + min_height="0" + mouse_opaque="false" + width="147" + top="0" + name="speakers_list_panel" + user_resize="false"> + <avatar_list + color="DkGray2" + follows="all" + height="130" + ignore_online_status="true" + layout="topleft" + name="speakers_list" + opaque="false" + show_info_btn="true" + show_profile_btn="false" + show_speaking_indicator="false" + width="147" /> + </layout_panel> + </layout_stack> +</panel> diff --git a/indra/newview/skins/minimal/xui/en/panel_login.xml b/indra/newview/skins/minimal/xui/en/panel_login.xml index 9b07051d81..ef058e5567 100644 --- a/indra/newview/skins/minimal/xui/en/panel_login.xml +++ b/indra/newview/skins/minimal/xui/en/panel_login.xml @@ -133,11 +133,12 @@ top="20" height="23" max_chars="128" top_pad="0" + tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." control_name="SessionSettingsFile" name="mode_combo" width="120"> <combo_box.item - label="Basic (Default)" + label="Basic" name="Basic" value="settings_minimal.xml" /> <combo_box.item |