From ab5e6c93c927935943b7135a8e70dd50256e3c2e Mon Sep 17 00:00:00 2001
From: Alexei Arabadji <aarabadji@productengine.com>
Date: Tue, 1 Dec 2009 15:16:12 +0200
Subject: =?UTF-8?q?implemented=20EXT-2799=20=E2=80=9CRecord=20to=20IM=20hi?=
 =?UTF-8?q?story=20notification=20about=20L$=20payments=20by=20other=20ava?=
 =?UTF-8?q?tar=E2=80=9D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

(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 cb0614797a..254c8a0f21 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4609,6 +4609,13 @@ Please select at least one type of content to search (PG, Mature, or Adult).
 [MESSAGE]
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="PaymentRecived"
+   type="notify">
+[MESSAGE]
+  </notification>
+  
   <notification
    icon="notify.tga"
    name="EventNotification"
-- 
cgit v1.2.3


From 32887cdc5407c7ced2d030cc8423fb0ab688170f Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Tue, 1 Dec 2009 17:13:35 +0200
Subject: Implemented normal task EXT-2750 (Add context menu for group and
 ad-hoc chiclet) Added menu to ad-hoc chiclet, which contains one 'End
 Session' item.

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_imchiclet_adhoc.xml     | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
new file mode 100644
index 0000000000..eb5e31b57d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_imchiclet_adhoc.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ height="101"
+ layout="topleft"
+ left="100"
+ mouse_opaque="false"
+ name="IMChiclet AdHoc Menu"
+ top="724"
+ visible="false"
+ width="128">
+    <menu_item_call
+     label="End Session"
+     layout="topleft"
+     name="End Session">
+        <menu_item_call.on_click
+         function="IMChicletMenu.Action"
+         parameter="end" />
+    </menu_item_call>
+</menu>
-- 
cgit v1.2.3


From 573f146b7b69e70cd1e509cf50a6253355aa70be Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Tue, 1 Dec 2009 17:54:38 +0200
Subject: fix normal EXT-2937 Nearby Chat window has layout issues

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_nearby_chat.xml | 8 +++++---
 indra/newview/skins/default/xui/en/panel_chat_header.xml   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
index d8534bfe0b..0856049374 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -22,13 +22,15 @@
              bg_readonly_color="ChatHistoryBgColor"
              bg_writeable_color="ChatHistoryBgColor"
              follows="all"
-	    left="1"
+	         left="5"
              top="20"
              layout="topleft"
-	    height="280"
+	         height="275"
              name="chat_history"
              parse_highlights="true"
              text_color="ChatHistoryTextColor"
              text_readonly_color="ChatHistoryTextColor"
-             width="320" />
+             right_widget_pad="5"
+             left_widget_pad="0"
+             width="315" />
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_chat_header.xml b/indra/newview/skins/default/xui/en/panel_chat_header.xml
index c1090a1686..9cb765ae93 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_header.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_header.xml
@@ -8,7 +8,7 @@
      label="im_header"
 	 layout="topleft"
      name="im_header"
-     width="300">
+     width="310">
 		<avatar_icon
          follows="left"
          height="18"
-- 
cgit v1.2.3


From 3385ce87f14f71d739a3834fbf3436a962fbdd9d Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Tue, 1 Dec 2009 20:10:18 +0200
Subject: Implemented major task EXT-2986 (Add "Leave Call" button in Voice
 Control Panel for all voice chats except nearby).

--HG--
branch : product-engine
---
 .../default/xui/en/floater_voice_controls.xml      | 27 ++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 04696ca2e7..c59d97457e 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -74,6 +74,7 @@
              width="20" />
         </panel>
         <layout_stack
+         animate="false"
          bottom="10"
          clip="false"
          follows="left|right|top"
@@ -82,9 +83,11 @@
          orientation="horizontal"
          width="262">
             <layout_panel
+             auto_resize="false" 
              follows="left"
              layout="topleft"
              min_width="24"
+             name="microphone_icon_panel" 
              top="0"
              user_resize="false"
              width="24">
@@ -98,9 +101,11 @@
             </layout_panel>
             <layout_panel
              layout="topleft"
+             min_width="138" 
+             name="volume_slider_panel"
              top="0"
              user_resize="false"
-             width="258">
+             width="138">
                 <slider_bar
                  control_name="AudioLevelMic"
                  follows="left|right|top"
@@ -113,7 +118,25 @@
                  tool_tip="Master Volume"
                  top="0"
                  value="0.75"
-                 width="258" />
+                 width="138" />
+            </layout_panel>
+            <layout_panel
+             auto_resize="false"
+             layout="topleft"
+             min_width="100" 
+             name="leave_btn_panel" 
+             top="0"
+             user_resize="false"
+             visible="false" 
+             width="100">
+                <button
+                 follows="left|right|top"
+                 height="24"
+                 label="Leave Call"
+                 left="0" 
+                 name="leave_call_btn"
+                 top="0" 
+                 width="100" />
             </layout_panel>
         </layout_stack>
     </panel>
-- 
cgit v1.2.3


From 09d6eeceb8367879c0ce158e20eae9732909596c Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 2 Dec 2009 10:41:53 +0200
Subject: Minor changes to EXT-2986 (Add "Leave Call" button in Voice Control
 Panel for all voice chats except nearby) implementation.

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/floater_voice_controls.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index c59d97457e..2652fae214 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -101,7 +101,6 @@
             </layout_panel>
             <layout_panel
              layout="topleft"
-             min_width="138" 
              name="volume_slider_panel"
              top="0"
              user_resize="false"
-- 
cgit v1.2.3


From 9b656c31ee64e99fc6c7049d36ce1971f2af3903 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 2 Dec 2009 13:39:17 +0200
Subject: Fixed minor EXT-2993 (bug voice control window should have valid
 minimal & maximal size). Maximal size was not set, because there are no any
 floaters which have it.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 2652fae214..6203e7c493 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
  can_resize="true"
- height="300"
+ height="270"
  layout="topleft"
+ min_height="146"
+ min_width="190"  
  name="floater_voice_controls"
  title="Voice Controls"
  save_visibility="true"
-- 
cgit v1.2.3


From 9d8b189886ae14800d58f9729d8c8ea9b338ed52 Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 2 Dec 2009 14:18:40 +0200
Subject: Implemented normal sub-task EXT-2975 - Make the IM multifloater
 optional.

--HG--
branch : product-engine
---
 .../default/xui/en/panel_preferences_chat.xml      | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index fac0d5c60f..3aa5d3fae4 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -318,4 +318,37 @@
      name="plain_text_chat_history"
      top_pad="5"
      width="400" />
+    <text
+     left="30"
+     height="20"
+     width="300"
+     top_pad="20">
+     Show IMs in:
+    </text>
+    <radio_group
+     height="30"
+     layout="topleft"
+     left="30"
+     control_name="ChatWindow"
+     name="chat_window"
+     top_pad="10"
+     tool_tip="Show chat in multiple windows(by default) or in one multi-tabbed window (requires restart)"
+     width="331">
+     <radio_item
+      height="16"
+      label="Multiple windows"
+      layout="topleft"
+      left="0"
+      name="radio"
+      top="0"
+      width="150" />
+     <radio_item
+      height="16"
+      label="One window"
+      layout="topleft"
+      left_delta="145"
+      name="radio2"
+      top_delta="0"
+      width="150" />
+    </radio_group>
 </panel>
-- 
cgit v1.2.3


From 876762d714230c586761cee3e6523eaabf590ef1 Mon Sep 17 00:00:00 2001
From: Paul Guslisty <pguslisty@productengine.com>
Date: Wed, 2 Dec 2009 19:28:12 +0200
Subject: fixed normal bug EXT-3039 (Overflow menu for Pick/Classified contain
 duplicated entries)

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index 4f0d155876..4c2bd67337 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -162,16 +162,5 @@
          tab_stop="false"
          top="0"
          width="50" />
-        <button
-         enabled="false"
-         follows="bottom|right"
-         height="25"
-         label="▼"
-         layout="topleft"
-         name="overflow_btn"
-         right="-10"
-         tab_stop="false"
-         top="0"
-         width="30" />
         </panel>
 </panel>
-- 
cgit v1.2.3


From aa84c4afff251d771c7571803ccce56d1f439ae2 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 2 Dec 2009 19:33:18 +0200
Subject: Implemented major task EXT-2985 (Implement Avaline calls processing
 in Voice Control Panel) -- checkin missed changes in xml file

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_voice_controls.xml b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
index 6203e7c493..1ebc51f504 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_controls.xml
@@ -22,6 +22,10 @@
      name="title_adhoc">
         Conference Call
     </string>
+    <string
+     name="title_peer_2_peer">
+        Call with [NAME]
+    </string>
     <string
      name="no_one_near">
         No one near
@@ -150,4 +154,13 @@
      multi_select="true"
      name="speakers_list"
      width="282" />
+    <panel
+     filename="panel_avatar_list_item.xml"
+     follows="left|right|top"
+     height="24"
+     layout="topleft"
+     left="0"
+     name="non_avatar_caller"
+     top="70"
+     width="282" />
 </floater>
-- 
cgit v1.2.3


From eae60da6839906059d904c12cc155f4c2738c893 Mon Sep 17 00:00:00 2001
From: Yuri Chebotarev <ychebotarev@productengine.com>
Date: Wed, 2 Dec 2009 19:37:33 +0200
Subject: fix for EXT-2886 Context menu for Nearby chat text field should look
 like context menu for any text editor, should include such items as
 (cut,copy, paste etc)

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_bottomtray.xml       | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)

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

diff --git a/indra/newview/skins/default/xui/en/menu_bottomtray.xml b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
index a7abb223ba..7ef91a1d85 100644
--- a/indra/newview/skins/default/xui/en/menu_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/menu_bottomtray.xml
@@ -52,4 +52,57 @@
              function="CheckControl"
              parameter="ShowSnapshotButton" />
     </menu_item_check>        
+    <menu_item_separator
+     name="Separator" />
+    <menu_item_call
+     label="Cut"
+     name="NearbyChatBar_Cut">
+        <menu_item_call.on_click
+         function="NearbyChatBar.Action"
+         parameter="cut" />
+        <menu_item_call.on_enable
+         function="NearbyChatBar.EnableMenuItem"
+         parameter="can_cut" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy"
+     name="NearbyChatBar_Copy">
+        <menu_item_call.on_click
+         function="NearbyChatBar.Action"
+         parameter="copy" />
+        <menu_item_call.on_enable
+         function="NearbyChatBar.EnableMenuItem"
+         parameter="can_copy" />
+    </menu_item_call>
+    <menu_item_call
+     label="Paste"
+     name="NearbyChatBar_Paste">
+        <menu_item_call.on_click
+         function="NearbyChatBar.Action"
+         parameter="paste" />
+        <menu_item_call.on_enable
+         function="NearbyChatBar.EnableMenuItem"
+         parameter="can_paste" />
+    </menu_item_call>
+    <menu_item_call
+     label="Delete"
+     name="NearbyChatBar_Delete">
+        <menu_item_call.on_click
+         function="NearbyChatBar.Action"
+         parameter="delete" />
+        <menu_item_call.on_enable
+         function="NearbyChatBar.EnableMenuItem"
+         parameter="can_delete" />
+    </menu_item_call>
+    <menu_item_call
+     label="Select All"
+     name="NearbyChatBar_Select_All">
+        <menu_item_call.on_click
+         function="NearbyChatBar.Action"
+         parameter="select_all" />
+        <menu_item_call.on_enable
+         function="NearbyChatBar.EnableMenuItem"
+         parameter="can_select_all" />
+    </menu_item_call>
+
 </menu>
-- 
cgit v1.2.3


From 2b2178fe2535e27aadfaa94f70fce05b2f8d63ad Mon Sep 17 00:00:00 2001
From: Sergey Borushevsky <sborushevsky@productengine.com>
Date: Wed, 2 Dec 2009 19:52:28 +0200
Subject: Fix for normal task EXT-2640 (Create a tabbed IM multifloater)
 Minimize button is hidden. Removed redundant parameters.

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

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

diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml
index cf6a4e45bd..cd297af99d 100644
--- a/indra/newview/skins/default/xui/en/floater_im_container.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_container.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater
-background_visible="true"
-bg_color="yellow" 
+ can_minimize="false"
  can_resize="true"
  height="390"
  layout="topleft"
-- 
cgit v1.2.3