From 2d7a09839ea75bf8b87220f5585e5d6fd2a11d72 Mon Sep 17 00:00:00 2001 From: AlexanderP ProductEngine Date: Wed, 3 Apr 2013 20:39:35 +0300 Subject: CHUI-841 FIXED No warning given that you cannot leave a group you are the last owner of in conversation floater and people floater Added check in LLGroupActions::leave() method for number of members in the group and whether avatar is the owner. Also added LLFetchGroupMemberData class which sends and handles async request for group member data and used in the above method. --- indra/newview/skins/default/xui/en/notifications.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 105bef7321..49e2ddfb14 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3648,6 +3648,17 @@ Leave Group? yestext="OK"/> + + Unable to leave group. You cannot leave the group because you are the last owner of the group. Please assign another member to the owner role first. + group + + + Date: Thu, 25 Apr 2013 18:47:09 +0300 Subject: CHUI-759 FIXED Group invites never received in do not disturb mode when leaving do not disturb mode --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 49e2ddfb14..bb3044a0d5 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6524,7 +6524,7 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th icon="notify.tga" name="JoinGroup" persist="true" - type="notify"> + type="offer"> group [MESSAGE]
-- cgit v1.2.3 From 64fc027a0bd87be0629ef95a5b7d0ab736c97a9e Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Thu, 6 Jun 2013 19:11:28 +0300 Subject: CHUI-975 FIXED Message text is changed --- indra/newview/skins/default/xui/en/notifications.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 9d1973f267..7c4ad2b819 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5954,9 +5954,7 @@ Your calling card was declined. icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> - To contact Residents like '[NAME]', click on the "People" button , select a Resident from the window that opens, then click 'IM' at the - bottom of the window. - (You can also double-click on their name in the list, or right-click and choose 'IM'). + To open a private conversation with someone, right-click on their avatar and choose "IM" from the menu. Date: Thu, 6 Jun 2013 19:15:49 +0300 Subject: CHUI-975 Fixed apostrophes --- indra/newview/skins/default/xui/en/notifications.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 7c4ad2b819..6ed5f6b2cc 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5954,7 +5954,7 @@ Your calling card was declined. icon="notifytip.tga" name="TeleportToPerson" type="notifytip"> - To open a private conversation with someone, right-click on their avatar and choose "IM" from the menu. + To open a private conversation with someone, right-click on their avatar and choose 'IM' from the menu. Date: Tue, 11 Jun 2013 18:54:54 -0600 Subject: STORM-1952: Add a confirmation modal when ejecting a member from a group --- .../newview/skins/default/xui/en/notifications.xml | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 970a11c6c4..620154fe51 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -506,6 +506,33 @@ Add this Ability to '[ROLE_NAME]'? notext="No" yestext="Yes"/> + + + You are about to eject [AVATAR_NAME] from the group. + group + confirm + + + + You are about to eject [COUNT] members from the group. + group + confirm + + Date: Thu, 13 Jun 2013 15:40:12 -0400 Subject: STORM-1953 Notifications that involve deleting something -- errors in text --- indra/newview/skins/default/xui/en/notifications.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/skins/default/xui/en/notifications.xml') diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 970a11c6c4..4cad8482d0 100755 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -2682,7 +2682,7 @@ Please enter a higher price. icon="alertmodal.tga" name="ConfirmItemDeleteHasLinks" type="alertmodal"> -At least one of the items you has link items that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first. +At least one of the items has links that point to it. If you delete this item, its links will permanently stop working. It is strongly advised to delete the links first. Are you sure you want to delete these items? confirm @@ -2724,7 +2724,7 @@ Are you sure you want to delete these items? icon="alertmodal.tga" name="ConfirmObjectDeleteNoOwn" type="alertmodal"> -You do not own least one of the items you have selected. +You do not own at least one of the items you have selected. Are you sure you want to delete these items? confirm @@ -2754,7 +2754,7 @@ Are you sure you want to delete these items? name="ConfirmObjectDeleteLockNoOwn" type="alertmodal"> At least one object is locked. -You do not own least one object. +You do not own at least one object. Are you sure you want to delete these items? confirm @@ -2769,7 +2769,7 @@ Are you sure you want to delete these items? name="ConfirmObjectDeleteNoCopyNoOwn" type="alertmodal"> At least one object is not copyable. -You do not own least one object. +You do not own at least one object. Are you sure you want to delete these items? confirm @@ -2785,13 +2785,13 @@ Are you sure you want to delete these items? type="alertmodal"> At least one object is locked. At least one object is not copyable. -You do not own least one object. +You do not own at least one object. Are you sure you want to delete these items? confirm -- cgit v1.2.3