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