diff options
Diffstat (limited to 'indra/newview/skins')
9 files changed, 327 insertions, 60 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 50193a198b..c453a8d2c7 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -329,7 +329,8 @@ Do you want to revoke modify rights for the selected Residents? type="alertmodal"> Unable to create group. [MESSAGE] -<tag>fail</tag> + <tag>group</tag> + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -341,7 +342,8 @@ Unable to create group. type="alertmodal"> [NEEDS_APPLY_MESSAGE] [WANT_APPLY_MESSAGE] -<tag>confirm</tag> + <tag>confirm</tag> + <tag>group</tag> <usetemplate canceltext="Cancel" name="yesnocancelbuttons" @@ -354,7 +356,8 @@ Unable to create group. name="MustSpecifyGroupNoticeSubject" type="alertmodal"> You must specify a subject to send a group notice. -<tag>fail</tag> + <tag>group</tag> + <tag>fail</tag> <usetemplate name="okbutton" yestext="OK"/> @@ -368,6 +371,7 @@ You are about to add group members to the role of [ROLE_NAME]. Members cannot be removed from that role. The members must resign from the role themselves. Are you sure you want to continue? + <tag>group</tag> <tag>confirm</tag> <usetemplate ignoretext="Confirm before I add a new group Owner" @@ -429,6 +433,7 @@ Joining this group costs L$[COST]. Do you wish to proceed? <tag>confirm</tag> <tag>funds</tag> + <tag>group</tag> <usetemplate name="okcancelbuttons" notext="Cancel" @@ -441,6 +446,7 @@ Do you wish to proceed? type="alertmodal"> You are joining group [NAME]. Do you wish to proceed? + <tag>group</tag> <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -455,6 +461,7 @@ Do you wish to proceed? type="alertmodal"> Joining this group costs L$[COST]. You do not have enough L$ to join this group. + <tag>group</tag> <tag>fail</tag> <tag>funds</tag> </notification> @@ -466,6 +473,7 @@ You do not have enough L$ to join this group. Creating this group will cost L$100. Groups need more than one member, or they are deleted forever. Please invite members within 48 hours. + <tag>group</tag> <tag>funds</tag> <usetemplate canceltext="Cancel" @@ -536,6 +544,7 @@ Are you sure you want to return all objects shared with the group '[NAME]&a Objects: [N] <tag>confirm</tag> + <tag>group</tag> <usetemplate name="okcancelbuttons" notext="Cancel" @@ -636,6 +645,7 @@ Return the objects on this parcel of land that are NOT shared with the group [NA Objects: [N] <tag>confirm</tag> + <tag>group</tag> <usetemplate name="okcancelbuttons" notext="Cancel" @@ -1341,6 +1351,7 @@ Eject [AVATAR_NAME] from your land? persist="true" type="notify"> You ejected [AVATAR_NAME] from group [GROUP_NAME] + <tag>group</tag> </notification> <notification @@ -1932,6 +1943,7 @@ No parcel selected. type="alertmodal"> Unable to deed land: No Group selected. + <tag>group</tag> <tag>fail</tag> </notification> @@ -2233,6 +2245,7 @@ Darn. You have been logged out of [SECOND_LIFE] type="alertmodal"> Unable to buy land for the group: You do not have permission to buy land for your active group. + <tag>group</tag> <tag>fail</tag> </notification> @@ -2600,6 +2613,7 @@ By deeding this parcel, the group will be required to have and maintain sufficie The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members. Deed this [AREA] m² of land to the group '[GROUP_NAME]'? + <tag>group</tag> <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -2616,6 +2630,7 @@ The deed will include a simultaneous land contribution to the group from '[ The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members. Deed this [AREA] m² of land to the group '[GROUP_NAME]'? + <tag>group</tag> <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -2953,6 +2968,7 @@ Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS]. name="MaxAllowedGroupsOnRegion" type="alertmodal"> You can only have [MAX_GROUPS] Allowed Groups. + <tag>group</tag> <usetemplate name="okcancelbuttons" notext="Cancel" @@ -3234,6 +3250,7 @@ We must restart [APP_NAME] to install the update. type="alertmodal"> Deeding this object will cause the group to: * Receive L$ paid into the object + <tag>group</tag> <tag>confirm</tag> <usetemplate ignoretext="Confirm before I deed an object to a group" @@ -3367,6 +3384,7 @@ Are you sure you want to return the selected objects to their owners? Transferab type="alert"> You are currently a member of the group [GROUP]. Leave Group? + <tag>group</tag> <tag>confirm</tag> <usetemplate name="okcancelbuttons" @@ -3470,6 +3488,7 @@ Chat and instant messages will be hidden. Instant messages will get your Busy mo type="alert"> You have reached your maximum number of groups. Please leave another group before joining this one, or decline the offer. [NAME] has invited you to join a group as a member. + <tag>group</tag> <tag>fail</tag> <usetemplate name="okcancelbuttons" @@ -3482,6 +3501,7 @@ You have reached your maximum number of groups. Please leave another group befor name="JoinedTooManyGroups" type="alert"> You have reached your maximum number of groups. Please leave some group before joining or creating a new one. + <tag>group</tag> <tag>fail</tag> <usetemplate name="okbutton" @@ -3854,6 +3874,7 @@ Remove from allowed list for this estate only or for [ALL_ESTATES]? name="EstateAllowedGroupAdd" type="alert"> Add to group allowed list for this estate only or for [ALL_ESTATES]? + <tag>group</tag> <tag>confirm</tag> <usetemplate canceltext="Cancel" @@ -3868,6 +3889,7 @@ Add to group allowed list for this estate only or for [ALL_ESTATES]? name="EstateAllowedGroupRemove" type="alert"> Remove from group allowed list for this estate only or [ALL_ESTATES]? + <tag>group</tag> <tag>confirm</tag> <usetemplate canceltext="Cancel" @@ -4243,6 +4265,7 @@ Does this classified contain Moderate content? name="SetGroupMature" type="alertmodal"> Does this group contain Moderate content? + <tag>group</tag> <tag>confirm</tag> <usetemplate canceltext="Cancel" @@ -5089,6 +5112,7 @@ Replaced missing clothing/body part with default. persist="true" type="groupnotify"> Topic: [SUBJECT], Message: [MESSAGE] + <tag>group</tag> </notification> <notification @@ -5550,6 +5574,7 @@ The objects on the selected parcel of land owned by the Resident '[NAME]&ap The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner's inventory. Transferable deeded objects have been returned to their previous owners. Non-transferable objects that are deeded to the group have been deleted. + <tag>group</tag> </notification> <notification @@ -5940,6 +5965,7 @@ An object named <nolink>[OBJECTFROMNAME]</nolink> owned by [NAME_SLU name="JoinGroup" persist="true" type="notify"> + <tag>group</tag> [MESSAGE] <form name="form"> <button @@ -6253,6 +6279,7 @@ Grant this request? icon="notify.tga" name="ScriptDialogGroup" type="notify"> + <tag>group</tag> [GROUPNAME]'s '<nolink>[TITLE]</nolink>' [MESSAGE] <form name="form"> @@ -6382,7 +6409,8 @@ Click Accept to join the call or Decline to decline the invitation. Click Block type="notify"> [NAME] has joined a Voice Chat call with the group [GROUP]. Click Accept to join the call or Decline to decline the invitation. Click Block to block this caller. - <tag>confirm</tag> + <tag>group</tag> + <tag>confirm</tag> <tag>voice</tag> <unique> <context>NAME</context> @@ -6604,6 +6632,7 @@ New Voice Morphs are available! name="Cannot enter parcel: not a group member" type="notifytip"> <tag>fail</tag> + <tag>group</tag> Only members of a certain group can visit this area. </notification> @@ -6661,7 +6690,7 @@ The SLurl you clicked on is not supported. name="BlockedSLURL" priority="high" type="notifytip"> - <tag>win</tag> + <tag>security</tag> A SLurl was received from an untrusted browser and has been blocked for your security. </notification> @@ -6670,6 +6699,7 @@ A SLurl was received from an untrusted browser and has been blocked for your sec name="ThrottledSLURL" priority="high" type="notifytip"> + <tag>security</tag> Multiple SLurls were received from an untrusted browser within a short period. They will be blocked for a few seconds for your security. </notification> @@ -6797,6 +6827,7 @@ Items successfully shared. name="DeedToGroupFail" type="notifytip"> Deed to group failed. + <tag>group</tag> <tag>fail</tag> </notification> @@ -6942,6 +6973,7 @@ This will also cause all residents that later join the call to be muted, even after you have left the call. Mute everyone? + <tag>group</tag> <tag>confirm</tag> <tag>voice</tag> <usetemplate 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> |