From 88f2d107c0a757b9cc6dee7c30a9482c02a05c08 Mon Sep 17 00:00:00 2001
From: "Yuri Chebotarev ychebotarev@productengine.com"
 <Yuri Chebotarev ychebotarev@productengine.com>
Date: Mon, 26 Oct 2009 11:14:13 +0200
Subject: no ticket set single_instance for nearby_chat floater

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

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

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 25d337ccec..d24d1b7064 100644
--- a/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/en/floater_nearby_chat.xml
@@ -14,6 +14,7 @@
  save_rect="true"
  title="Nearby Chat"
  save_visibility="true"
+ single_instance="true"
  width="320">
             <chat_history
              allow_html="true" 
-- 
cgit v1.2.3


From f22f829b8642d59cb5953eb33f5297a1da90fadd Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Mon, 26 Oct 2009 17:14:32 +0200
Subject: Fixed normal bugs EXT-1628 ([BSI] - New IM system isn't sending
 typing notifications anymore) and EXT-1629 ([BSI] - add hint in IM window
 when Resident is typing)

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4c19b22ac5..7efda2b882 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -264,10 +264,6 @@
 	<string name="TrackYourCamera">Track your camera</string>
 	<string name="ControlYourCamera">Control your camera</string>
 
-	<!-- IM -->
-	<string name="IM_logging_string">-- Instant message logging enabled --</string>
-	<string name="Unnamed">(Unnamed)</string>
-	
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">PG</string>
 	<string name="SIM_ACCESS_MATURE">Mature</string>
@@ -2884,7 +2880,11 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	  Failed to start viewer
 	</string>
 
-  <!-- IM system messages -->
+	<!-- IM system messages -->
+	<string name="IM_logging_string">-- Instant message logging enabled --</string>
+	<string name="IM_typing_start_string">[NAME] is typing...</string>
+	<string name="Unnamed">(Unnamed)</string>
+
   <string name="ringing-im">
     Joining Voice Chat...
   </string>
-- 
cgit v1.2.3


From ff37134a405e81899b4d9e7d07be7e3da85c8278 Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Mon, 26 Oct 2009 19:30:46 +0200
Subject: Implemented low task EXT-1156(Implement option to show/hide avatar
 icon in the friend list)

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_people_friends_view_sort.xml    | 11 ++++++++---
 .../skins/default/xui/en/menu_people_nearby_view_sort.xml     | 11 ++++++++---
 .../skins/default/xui/en/menu_people_recent_view_sort.xml     | 11 ++++++++---
 3 files changed, 24 insertions(+), 9 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index cc17e9dd4b..eedb4383bb 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -23,9 +23,14 @@
        parameter="sort_status" />
   </menu_item_check>
   <menu_item_separator layout="topleft" />
-  <menu_item_call name="view_icons" label="View People Icons">
-    <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="view_icons" />
-  </menu_item_call>
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Friends.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="FriendsListShowIcons" />
+  </menu_item_check>
   <menu_item_call name="organize_offline" label="Organize Offline Friends">
     <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="organize_offline" />
   </menu_item_call>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index f91a961388..c002cd078f 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -12,9 +12,14 @@
     <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="sort_distance" />
   </menu_item_call>
   <menu_item_separator layout="topleft" />
-  <menu_item_call name="view_icons" label="View People Icons">
-    <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="view_icons" />
-  </menu_item_call>
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Nearby.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="NearbyListShowIcons" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index d09871cff3..cfd6dc78b6 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -23,9 +23,14 @@
        parameter="sort_name" />
   </menu_item_check>
   <menu_item_separator layout="topleft" />
-  <menu_item_call name="view_icons" label="View People Icons">
-    <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" />
-  </menu_item_call>
+  <menu_item_check name="view_icons" label="View People Icons">
+    <menu_item_check.on_click
+     function="People.Recent.ViewSort.Action"
+     parameter="view_icons" />
+    <menu_item_check.on_check
+     function="CheckControl"
+     parameter="RecentListShowIcons" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
-- 
cgit v1.2.3


From 3b40f9052bdd22ca26610becaa8c37fba07cc1f2 Mon Sep 17 00:00:00 2001
From: Denis Serdjuk <dserduk@productengine.com>
Date: Tue, 27 Oct 2009 13:49:06 +0200
Subject: fixed Bug   	 EXT-1602   	 'Add new folder' and 'Add new
 landmark' has same icons that is deceitful New menubutton has been
 implemented according to Viewer 2.0 Design Specification:Places Task Panel.
 It generates a menu for AddLandmark and AddFolder options

--HG--
branch : product-engine
---
 .../skins/default/xui/en/menu_place_add_button.xml | 27 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_landmarks.xml       | 14 +----------
 2 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_place_add_button.xml

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

diff --git a/indra/newview/skins/default/xui/en/menu_place_add_button.xml b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
new file mode 100644
index 0000000000..e3a39a1242
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_place_add_button.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu
+ layout="topleft"
+ left="0"
+ mouse_opaque="false"
+ name="menu_folder_gear"
+ visible="false">
+    <menu_item_call
+     label="Add Folder"
+     layout="topleft"
+     name="add_folder">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="category" />
+        <on_enable
+         function="Places.LandmarksGear.Enable"
+         parameter="category" />
+    </menu_item_call>
+    <menu_item_call
+     label="Add Landmark"
+     layout="topleft"
+     name="add_landmark">
+        <on_click
+         function="Places.LandmarksGear.Add.Action"
+         parameter="add_landmark" />
+    </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml
index c33f68eaf7..5293043ba7 100644
--- a/indra/newview/skins/default/xui/en/panel_landmarks.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml
@@ -114,22 +114,10 @@
          image_disabled="AddItem_Disabled"
          layout="topleft"
          left_pad="5"
-         name="add_landmark_btn"
+         name="add_btn"
          picture_style="true"
          tool_tip="Add new landmark"
          width="18" />
-        <button
-         follows="bottom|left"
-         height="18"
-         image_selected="AddItem_Press"
-         image_unselected="AddItem_Off"
-         image_disabled="AddItem_Disabled"
-         layout="topleft"
-         left_pad="5"
-         name="add_folder_btn"
-         picture_style="true"
-         tool_tip="Add new folder"
-         width="18" />
         <dnd_button
          follows="bottom|right"
          height="18"
-- 
cgit v1.2.3


From 67cd718d7aea52ed808c090c33cde953310ddf32 Mon Sep 17 00:00:00 2001
From: Eugene Kondrashev <ekondrashev@productengine.com>
Date: Tue, 27 Oct 2009 16:35:51 +0200
Subject: Fixed normal bug ext-1856-All participants of group chat/friends
 conference listed like off-line

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 9767a673f6..027b5ecf70 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -12,7 +12,8 @@
      left="3"
      name="speakers_list"
      top="10"
-     width="140"/>
+     width="140"
+     ignore_online_status="true"/>
     <button
      name="group_info_btn"
      label="Group Info"
-- 
cgit v1.2.3


From 21e8e11c64e8aa9dd2976e9ace95928de062c9ae Mon Sep 17 00:00:00 2001
From: Eugene Kondrashev <ekondrashev@productengine.com>
Date: Tue, 27 Oct 2009 17:28:11 +0200
Subject: Moved last added property meeting the alphabetical order

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 027b5ecf70..0984512f58 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -8,12 +8,12 @@
      color="DkGray2"
      follows="left|top|right|bottom"
      height="150"
+     ignore_online_status="true"
      layout="topleft"
      left="3"
      name="speakers_list"
      top="10"
-     width="140"
-     ignore_online_status="true"/>
+     width="140" />
     <button
      name="group_info_btn"
      label="Group Info"
-- 
cgit v1.2.3


From 3eb7f84b10832d77d8765ea9550108c67c462bcb Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Tue, 27 Oct 2009 18:01:41 +0200
Subject: IM: implemented task EXT-1905 (Add "Call" and "End Call"
 functionality to new IIM Floater)

--HG--
branch : product-engine
---
 indra/newview/skins/default/xui/en/panel_group_control_panel.xml | 8 +++++++-
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml    | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 9767a673f6..e1f18d8b7d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -7,7 +7,7 @@
     <avatar_list
      color="DkGray2"
      follows="left|top|right|bottom"
-     height="150"
+     height="130"
      layout="topleft"
      left="3"
      name="speakers_list"
@@ -24,4 +24,10 @@
      label="Call"
      width="90"
      height="20" />
+    <button
+     name="end_call_btn"
+     label="End Call"
+     width="90"
+     height="20" 
+     visible="false"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index 7dc94d1141..dca52def49 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_im_control_panel"
        width="96"
-       height="215"
+       height="225"
        border="false">
 
   <avatar_icon name="avatar_icon"
@@ -24,6 +24,13 @@
           width="90"
           height="20" />
 
+    <button
+     height="20"
+     label="End Call"
+     name="end_call_btn"
+     visible="false"
+     width="90" />
+
   <button name="share_btn"
           label="Share"
           width="90"
-- 
cgit v1.2.3


From 3fd1072577beb82866471517eb63092e98f0c63c Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 28 Oct 2009 11:38:51 +0200
Subject: Fixed normal bug EXT-1451 - Scrollbar on Gestures tray needs bg
 color.

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

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

diff --git a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
index 89e442baec..ab4ad94089 100644
--- a/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml
@@ -23,7 +23,8 @@
                               image_selected="DropDown_Selected"
                               image_disabled="DropDown_Disabled"
                               image_disabled_selected="DropDown_Disabled_Selected" />
-  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" />
+  <gesture_combo_box.combo_list bg_writeable_color="MenuDefaultBgColor"
+                                scroll_bar_bg_visible="true" />
   <gesture_combo_box.combo_editor name="Combo Text Entry"
                           select_on_focus="true"
                           font="SansSerifSmall" />
-- 
cgit v1.2.3


From 33af464c441717db855651b70acc4b3636c649a0 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 28 Oct 2009 14:21:36 +0200
Subject: Implemented major sub-task EXT-1904 (New IM floater should handle
 Session Update)

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7efda2b882..7e9585d4bd 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2884,6 +2884,8 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_logging_string">-- Instant message logging enabled --</string>
 	<string name="IM_typing_start_string">[NAME] is typing...</string>
 	<string name="Unnamed">(Unnamed)</string>
+	<string name="IM_moderated_chat_label">(Moderated: Voices off by default)</string>
+
 
   <string name="ringing-im">
     Joining Voice Chat...
-- 
cgit v1.2.3


From a999e50a8ebb3ab641490294d67dbbd6eb0c8898 Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Wed, 28 Oct 2009 16:14:52 +0200
Subject: Implemented major sub-task EXT-1912 ( Add handling restrictions of
 PSTN P2P calls in new IM Floaters )

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

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

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 7e9585d4bd..8609d07be9 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2885,6 +2885,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_typing_start_string">[NAME] is typing...</string>
 	<string name="Unnamed">(Unnamed)</string>
 	<string name="IM_moderated_chat_label">(Moderated: Voices off by default)</string>
+	<string name="IM_unavailable_text_label">Text chat is not available for this call.</string>
 
 
   <string name="ringing-im">
-- 
cgit v1.2.3


From f5b4635c434c77ab6b9fc29f07891fe9625ca3dc Mon Sep 17 00:00:00 2001
From: Eugene Kondrashev <ekondrashev@productengine.com>
Date: Wed, 28 Oct 2009 18:21:31 +0200
Subject: Fixed Normal bug EXT-1913-Make Participant List in IM Floaters
 transparent the same as floaters when focus is lost

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
index 148e9a5562..15b6b2a00d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_control_panel.xml
@@ -12,6 +12,7 @@
      layout="topleft"
      left="3"
      name="speakers_list"
+     opaque="false"
      top="10"
      width="140" />
     <button
-- 
cgit v1.2.3


From 79738b2a65ef609f49db9bd2ff57fe5ae8e7e830 Mon Sep 17 00:00:00 2001
From: Eugene Kondrashev <ekondrashev@productengine.com>
Date: Wed, 28 Oct 2009 20:59:33 +0200
Subject: Fixed normal bug EXT-1857-'Group Info' btn is unnecessary in Friends
 Conference floater

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

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

diff --git a/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
new file mode 100644
index 0000000000..8db745fab7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ name="panel_im_control_panel"
+ width="146"
+ height="215"
+ border="false">
+    <avatar_list
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="130"
+     ignore_online_status="true"
+     layout="topleft"
+     left="3"
+     name="speakers_list"
+     opaque="false"
+     top="10"
+     width="140" />
+    <button
+     name="call_btn"
+     label="Call"
+     width="90"
+     height="20" />
+    <button
+     name="end_call_btn"
+     label="End Call"
+     width="90"
+     height="20" 
+     visible="false"/>
+</panel>
-- 
cgit v1.2.3


From da58b592177cc1960e611831038cb9c39eaee4c0 Mon Sep 17 00:00:00 2001
From: richard <none@none>
Date: Wed, 28 Oct 2009 15:21:23 -0700
Subject: ext-1483 - Scrollable lists in side panel can sometimes get stuck
 apparent XUI error Also fixed terminating newlines in text editors not
 flowing to next line

reviewed by Leyla
---
 indra/newview/skins/default/xui/en/panel_group_roles.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/indra/newview/skins/default/xui/en/panel_group_roles.xml b/indra/newview/skins/default/xui/en/panel_group_roles.xml
index 75ded4f249..af1919bd8f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_roles.xml
@@ -486,7 +486,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         </panel>
     </tab_container>
     <panel
-     height="170"
+     height="190"
      layout="topleft"
      follows="left|top"
      left="10"
@@ -556,7 +556,7 @@ things in this group. There&apos;s a broad variety of Abilities.
         </scroll_list>
     </panel>
     <panel
-     height="215"
+     height="252"
      layout="topleft"
      left_delta="0"
      name="roles_footer"
-- 
cgit v1.2.3