From 08c0d3876bcddb2beeabb6fb2cd1a620eeb02576 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Thu, 10 Dec 2009 14:45:41 +0200
Subject: Work on major task EXT-2808 (Add speakers moderation (both voice and
 text) to the Voice Control Panel (Active Speakers List))  -- Implemented
 Actions to Mute/Unmute Participants without using Agent's Block List  --
 Updated missing strings to show error while moderating

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c3650c71c3..8ac4ca95b9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2900,6 +2900,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="message_session_event">
     Unable to send your message to the chat session with [RECIPIENT].
   </string>
+  <string name="mute">
+    Error while moderating.
+  </string>
   <string name="removed_from_group">
     You have been removed from the group.
   </string>
-- 
cgit v1.2.3


From 1967034ca0a71f95ddcd793187a3e07d3acc6639 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Thu, 10 Dec 2009 21:40:46 +0200
Subject: implemented task EXT-2609   Implement 'block' option for inventory
 offers

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/notifications.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/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index a6ed1f4c86..8c69699bb5 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5026,14 +5026,14 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O
        index="0"
        name="Keep"
        text="Keep"/>
-      <button
-       index="4"
-       name="Show"
-       text="Show"/> 
       <button
        index="1"
        name="Discard"
        text="Discard"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Block"/>
     </form>
   </notification>
 
-- 
cgit v1.2.3


From 12fb5d3a2de9fe49c75b302353f09fc724245a1b Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Fri, 11 Dec 2009 14:54:48 +0200
Subject: fixed EXT-3152 (Group Voice chat Notification and Invitation should
 include group's name) and corrected titles of Voice Control Panel

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_incoming_call.xml b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
index acd59b6f09..81c54ae55e 100644
--- a/indra/newview/skins/default/xui/en/floater_incoming_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_incoming_call.xml
@@ -26,6 +26,10 @@
      name="VoiceInviteAdHoc">
         has joined a Voice Chat call with a conference chat.
     </floater.string>
+    <floater.string
+     name="VoiceInviteGroup">
+        has joined a Voice Chat call with the group [GROUP].
+    </floater.string>
     <avatar_icon
      enabled="false"
      follows="left|top"
-- 
cgit v1.2.3


From 069051afeb2a749664d40d813dc1cdf4437f7644 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 11 Dec 2009 16:34:38 +0200
Subject: Changed lables

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_participant_list.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 0422972cd4..ffe5430c55 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -49,7 +49,7 @@
          function="Avatar.Pay" />
     </menu_item_call>
     <menu_item_check
-     label="Block/Unblock"
+     label="BlockVoice/Unblock"
      layout="topleft"
      name="Block/Unblock">
         <menu_item_check.on_click
@@ -64,7 +64,7 @@
         <menu_item_separator
          layout="topleft" />
     <menu_item_check
-     label="Mute Text"
+     label="Block Text"
      layout="topleft"
      name="MuteText">
         <on_check
-- 
cgit v1.2.3


From 77b5ee1b4d7fb03f757efdaa4169ab38fb754b25 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Fri, 11 Dec 2009 18:33:37 +0200
Subject: Implemented major task EXT-3390 - Move Moderation options into
 submenu.

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

(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 ffe5430c55..adf4bd70e1 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -76,6 +76,10 @@
          function="ParticipantList.EnableItem"
          parameter="can_mute_text" />
     </menu_item_check>
+    <context_menu
+     label="Moderator Options &gt;"
+     layout="topleft"
+     name="Moderator Options" >
     <menu_item_check
      label="Allow text chat"
      layout="topleft"
@@ -136,4 +140,5 @@
          function="ParticipantList.EnableItem"
          parameter="can_moderate_voice" />
     </menu_item_call>
+    </context_menu>
 </context_menu>
-- 
cgit v1.2.3


From e56dae206e4774e16003d1f404a6814fd81a04d3 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Fri, 11 Dec 2009 18:58:16 +0200
Subject: fix for normal EXT-3285 Inactive expanded accordion panels have
 "selected" state

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/widgets/accordion_tab.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 9990324d03..102dc0c16d 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -8,7 +8,7 @@
     header_image="Accordion_Off"
     header_image_over="Accordion_Over"
     header_image_pressed="Accordion_Press"
-    header_image_expanded="Accordion_Selected"
+    header_image_focused="Accordion_Selected"
     header_text_color="LtGray"
     font="SansSerif"
     />
-- 
cgit v1.2.3


From 2acb204c4b1bdc4cc11c7af51ebfd09c47c3e231 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Fri, 11 Dec 2009 21:40:29 +0200
Subject: Fixed normal bug EXT-3281 (Group : Disable "Leave Group" for none).

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

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
index 304492bedb..df3cb26b04 100644
--- a/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml
@@ -19,5 +19,7 @@
    name="Leave Selected Group">
       <menu_item_call.on_click
        function="People.Group.Minus.Action"/>
+      <menu_item_call.on_enable
+       function="People.Group.Minus.Enable"/>
   </menu_item_call>
 </menu>
-- 
cgit v1.2.3


From fd99f8701cfe4cbcd95f847b77e985703937a581 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Fri, 11 Dec 2009 21:44:48 +0200
Subject: Fixed normal bug EXT - 2863 (Group Chat List Names right click do not
 contain view profile or send private message)

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_participant_list.xml        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 adf4bd70e1..449202aaaa 100644
--- a/indra/newview/skins/default/xui/en/menu_participant_list.xml
+++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml
@@ -16,7 +16,7 @@
         <menu_item_call.on_click
          function="Avatar.AddFriend" />
         <menu_item_call.on_enable
-         function="Avatar.EnableItem"
+         function="ParticipantList.EnableItem"
          parameter="can_add" />
     </menu_item_call>
     <menu_item_call
@@ -30,11 +30,14 @@
      label="Call"
      layout="topleft"
      name="Call">
-        <menu_item_call.on_click
+         <menu_item_call.on_click
          function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="ParticipantList.EnableItem"
+         parameter="can_call" />
     </menu_item_call>
     <menu_item_call
-     enabled="false"
+     enabled="true"
      label="Share"
      layout="topleft"
      name="Share">
@@ -49,16 +52,16 @@
          function="Avatar.Pay" />
     </menu_item_call>
     <menu_item_check
-     label="BlockVoice/Unblock"
+     label="Block Voice"
      layout="topleft"
      name="Block/Unblock">
         <menu_item_check.on_click
          function="Avatar.BlockUnblock" />
         <menu_item_check.on_check
-         function="Avatar.CheckItem"
+         function="ParticipantList.CheckItem"
          parameter="is_blocked" />
         <menu_item_check.on_enable
-         function="Avatar.EnableItem"
+         function="ParticipantList.EnableItem"
          parameter="can_block" />
     </menu_item_check>
         <menu_item_separator
-- 
cgit v1.2.3


From f446e2b94d05315a09e3068b258a606986ec8872 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Mon, 14 Dec 2009 12:49:48 +0200
Subject: Fixed Normal bug EXT-3115 ("Unable to start new chat session"
 MissingString(generic)) -- added string with name="generic" with the same
 value as "generic_request_error" into strings.xml (because "generic" is a
 part of server's response body)

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 8ac4ca95b9..00bbe71447 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2873,6 +2873,14 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="muted_message">
     You have blocked this resident. Sending a message will automatically unblock them.
   </string>
+  <!--Some times string name is getting from the body of server response.
+  For ex.: from gIMMgr::showSessionStartError in the LLViewerChatterBoxSessionStartReply::post. 
+  In case of the EXT-3115 issue 'generic' is passed into the gIMMgr::showSessionStartError as a string name.
+  Also there are some other places where "generic" is used.
+  So, let add string with name="generic" with the same value as "generic_request_error" -->
+  <string name="generic">
+    Error making request, please try again later.
+  </string>
   <string name="generic_request_error">
     Error making request, please try again later.
   </string>
-- 
cgit v1.2.3


From fe0da9bf7b81d24a9614f95d9f91012796eabf77 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Mon, 14 Dec 2009 19:53:54 +0200
Subject: Fixed low bug EXT - 3255 (Call button is enabled in the People &
 Profile panels while voice is disabled)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/menu_people_nearby.xml             | 3 +++
 indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml | 3 +++
 2 files changed, 6 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
index 39469f7101..5f2e6e0f6c 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml
@@ -32,6 +32,9 @@
      name="Call">
         <menu_item_call.on_click
          function="Avatar.Call" />
+        <menu_item_call.on_enable
+         function="Avatar.EnableItem"
+         parameter="can_call" />
     </menu_item_call>
     <menu_item_call
      label="Share"
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
index df74d2dcd4..0d3dd3366d 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
@@ -27,6 +27,9 @@
      name="Call">
         <on_click
          function="Avatar.Call" />
+        <on_enable
+         function="Avatar.EnableItem"
+         parameter="can_call" />
     </menu_item_call>
     <menu_item_call
      enabled="false"
-- 
cgit v1.2.3


From 929490262684270103427ad47cffece5a17f248a Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Tue, 15 Dec 2009 08:35:26 +0200
Subject: Fixed normal bug EXT - 3288 (Tool-tips are missing on whole Places
 panel)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_places.xml           | 2 ++
 indra/newview/skins/default/xui/en/panel_teleport_history.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index 88df529ec1..07f9095640 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -77,6 +77,7 @@ background_visible="true"
          layout="topleft"
          left="5"
          name="teleport_btn"
+         tool_tip="Teleport to the selected area"
          top="0"
          width="100" />
         <button
@@ -86,6 +87,7 @@ background_visible="true"
          layout="topleft"
          left_pad="5"
          name="map_btn"
+         tool_tip="Show selected area on the map"
          top="0"
          width="70" />
         <button
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
index 32fc9fce01..06da64533b 100644
--- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml
@@ -151,7 +151,7 @@
         <button
          follows="bottom|left"
          font="SansSerifBigBold"
-         tool_tip=""
+         tool_tip="Show additional optioins"
          height="18"
          image_disabled="OptionsMenu_Disabled"
          image_selected="OptionsMenu_Press"
-- 
cgit v1.2.3