From a16195fb81d7f4c7a5dd60f91d067bbdcac0f44d Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Apr 2010 15:50:45 +0300
Subject: Fixed normal bug EXT-6864 (Resident-related menu items are
 enabled/displayed for PSTN bridge callers)

* Disabled all currently processed menu items related to interaction with a resident for Avaline callers.
* Added enable callback for View Profile menu item to disable it for Avaline callers.
* Disabled menu items related to text chat.
Full list is:
 - View Profile
 - Add Friend
 - IM
 - Call
 - Share
 - Pay
 - Block Text
 - Moderate Options:
  -- Allow Text chat

DEV notes: To process moderation options separate "on_enable handler" was created for group moderate actions.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/261/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_participant_list.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml
index 59c7f4ed85..2515b60868 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -30,6 +30,9 @@
      name="View Profile">
         <menu_item_call.on_click
          function="Avatar.Profile" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_view_profile" />
     </menu_item_call>
     <menu_item_call
      label="Add Friend"
@@ -153,7 +156,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="selected" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -164,7 +167,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="others" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -175,7 +178,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="selected" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     <menu_item_call
@@ -186,7 +189,7 @@
          function="ParticipantList.ModerateVoice"
          parameter="others" />
         <on_enable
-         function="ParticipantList.EnableItem"
+         function="ParticipantList.EnableItem.Moderate"
          parameter="can_moderate_voice" />
     </menu_item_call>
     </context_menu>
-- 
cgit v1.2.3


From a94ec45cb18f262e9cb9277960c450d84479757b Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 19 Apr 2010 16:06:23 +0300
Subject: Fixed normal bug EXT-6896 (String changes to default help text in
 Friends, Nearby and Recent lists)

* Updated default help text in Friends, Nearby and Recent lists according to requirements in the ticket.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/259/

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_people.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default/xui/en')

diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 8131b75b70..43175c8509 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -13,10 +13,10 @@
  width="333">
     <string
      name="no_people"
-     value="No people" />
+     value="No recent people. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_one_near"
-     value="No one near" />
+     value="No one nearby. Looking for people to hang out with? Try [secondlife:///app/search/people Search] or the [secondlife:///app/worldmap World Map]." />
     <string
      name="no_friends_online"
      value="No friends online" />
@@ -264,8 +264,8 @@
              top="10"
              width="293"
              wrap="true">
-                To add friends try [secondlife:///app/search/people global search] or use right-click on a Resident to add them as a friend.
-If you're looking for people to hang out with, [secondlife:///app/worldmap try the Map].
+                Find friends using [secondlife:///app/search/people Search] or right-click on a Resident to add them as a friend.
+Looking for people to hang out with? Try the [secondlife:///app/worldmap World Map].
              </text>
         </panel>
         <panel
-- 
cgit v1.2.3