From 10a572da887ee599d6c4207cda3a106c7fc3aa65 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Thu, 3 Mar 2011 21:11:59 -0800 Subject: removed items from inspector menus that don't apply in minimal skin --- .../skins/minimal/xui/en/inspect_object.xml | 12 +-- .../minimal/xui/en/menu_inspect_avatar_gear.xml | 118 ++++++++++++++++++++- .../minimal/xui/en/menu_inspect_object_gear.xml | 116 +++++++++++++++++++- 3 files changed, 231 insertions(+), 15 deletions(-) (limited to 'indra/newview/skins') 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" /> - -- cgit v1.2.3 From 6613aebf8802555a47e278d68eef5336763d7d87 Mon Sep 17 00:00:00 2001 From: leyla Date: Mon, 7 Mar 2011 09:47:13 -0800 Subject: SOC-604 Make View contents in minimal skin match Standard skin (Viewer 2) --- .../skins/minimal/xui/en/floater_camera.xml | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'indra/newview/skins') diff --git a/indra/newview/skins/minimal/xui/en/floater_camera.xml b/indra/newview/skins/minimal/xui/en/floater_camera.xml index 62276199e5..76d1b97cab 100644 --- a/indra/newview/skins/minimal/xui/en/floater_camera.xml +++ b/indra/newview/skins/minimal/xui/en/floater_camera.xml @@ -253,5 +253,44 @@ top_pad="0" name="buttons" width="226"> + + + -- cgit v1.2.3 From c18252451306817ac4a07c823ef615c46edc7e85 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Mon, 7 Mar 2011 13:55:33 -0800 Subject: updated list of visible notifications to spec --- .../newview/skins/default/xui/en/notifications.xml | 42 +++++++++++++++++++--- .../minimal/xui/en/notification_visibility.xml | 36 +++++++++---------- 2 files changed, 55 insertions(+), 23 deletions(-) (limited to 'indra/newview/skins') 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] -fail + group + fail @@ -341,7 +342,8 @@ Unable to create group. type="alertmodal"> [NEEDS_APPLY_MESSAGE] [WANT_APPLY_MESSAGE] -confirm + confirm + group You must specify a subject to send a group notice. -fail + group + fail @@ -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? + group confirm confirm funds + group You are joining group [NAME]. Do you wish to proceed? + group confirm Joining this group costs L$[COST]. You do not have enough L$ to join this group. + group fail funds @@ -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. + group funds confirm + group confirm + group You ejected [AVATAR_NAME] from group [GROUP_NAME] + group Unable to deed land: No Group selected. + group fail @@ -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. + group fail @@ -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]'? + group confirm group confirm You can only have [MAX_GROUPS] Allowed Groups. + group Deeding this object will cause the group to: * Receive L$ paid into the object + group confirm You are currently a member of the group [GROUP]. Leave Group? + group confirm 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. + group fail You have reached your maximum number of groups. Please leave some group before joining or creating a new one. + group fail Add to group allowed list for this estate only or for [ALL_ESTATES]? + group confirm Remove from group allowed list for this estate only or [ALL_ESTATES]? + group confirm Does this group contain Moderate content? + group confirm Topic: [SUBJECT], Message: [MESSAGE] + group group + group [MESSAGE]