From 33d1d5bc4df2eaef6ca8f9e4111d8a437763766c Mon Sep 17 00:00:00 2001
From: Eugene Mutavchi <emutavchi@productengine.com>
Date: Tue, 9 Feb 2010 19:18:17 +0200
Subject: Fixed normal bug EXT-651 (Upload Image shortcut (Ctrl-U / Cmd-U) does
 not work)

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 22f4d277a4..4e9073bea5 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1594,6 +1594,16 @@
          name="Shortcuts"
          tear_off="true"
          visible="false">
+          <menu_item_call
+             label="Image (L$[COST])..."
+             layout="topleft"
+             name="Upload Image"
+             shortcut="control|U">
+            <menu_item_call.on_click
+               function="File.UploadImage"
+               parameter="" />
+            <menu_item_call.on_enable
+               function="File.EnableUpload" />
             <menu_item_check
                label="Search"
                layout="topleft"
-- 
cgit v1.2.3


From d3f30dc96e0232f1b1064da93e661e3a850a95fd Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 11:13:26 +0200
Subject: fix task EXT-5129 Move Group image and founder name into General
 accordion

--HG--
branch : product-engine
---
 .../skins/default/xui/en/panel_group_general.xml   | 75 +++++++++++++++++++++-
 .../default/xui/en/panel_group_info_sidetray.xml   | 64 +-----------------
 2 files changed, 74 insertions(+), 65 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 618167181f..662fd1ae73 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -20,15 +20,84 @@ Hover your mouse over the options for more help.
      name="incomplete_member_data_str">
         Retrieving member data
     </panel.string>
+   <panel
+      name="group_info_top"
+      follows="top|left"
+      top="0"
+      left="0"
+      height="129"
+      width="313"
+      layout="topleft">
+    <texture_picker
+     follows="left|top"
+     height="110"
+     label=""
+     layout="topleft"
+     left="10"
+     name="insignia"
+     no_commit_on_selection="true"
+     tool_tip="Click to choose a picture"
+     top="5"
+     width="100" />
+    <text
+      font="SansSerifSmall"
+      text_color="White_50"
+      width="190"
+      follows="top|left"
+      layout="topleft"
+      mouse_opaque="false"
+     type="string"
+     height="16"
+     length="1"
+     left_pad="10"
+     name="prepend_founded_by"
+     top_delta="0">
+      Founder:
+    </text>
+    <name_box
+     follows="left|top"
+     height="16"
+     initial_value="(retrieving)"
+     layout="topleft"
+     left_delta="0"
+     link="true"
+     name="founder_name"
+     top_pad="2"
+     use_ellipses="true"
+     width="190" />
+    <text
+    font="SansSerifMedium"
+    text_color="EmphasisColor"
+     type="string"
+     follows="left|top"
+     height="16"
+     layout="topleft"
+     left_delta="0"
+     name="join_cost_text"
+     top_pad="10"
+     visible="true"
+     width="190">
+      Free
+    </text>
+    <button
+     follows="left|top"
+     left_delta="0"
+     top_pad="6"
+     height="23"
+     label="JOIN NOW!"
+     name="btn_join"
+     visible="true"
+     width="120" />
+    </panel>
     <text_editor
      type="string"
      follows="left|top|right"
      left="5"
-     height="150"
+     height="80"
      layout="topleft"
      max_length="511"
      name="charter"
-     top="5"
+     top="105"
      right="-1"
     bg_readonly_color="DkGray2"
     text_readonly_color="White"
@@ -40,7 +109,7 @@ Hover your mouse over the options for more help.
      draw_heading="true"
      follows="left|top|right"
      heading_height="23"
-     height="200"
+     height="160"
      layout="topleft"
      left="0"
      name="visible_members"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 9727c54c6b..375de64923 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -31,7 +31,7 @@ background_visible="true"
       follows="top|left"
       top="0"
       left="0"
-      height="129"
+      height="29"
       width="313"
       layout="topleft">
     <button
@@ -70,66 +70,6 @@ background_visible="true"
      width="270"
      height="20"
      visible="false" />
-    <texture_picker
-     follows="left|top"
-     height="113"
-     label=""
-     layout="topleft"
-     left="10"
-     name="insignia"
-     no_commit_on_selection="true"
-     tool_tip="Click to choose a picture"
-     top_pad="5"
-     width="100" />
-    <text
-      font="SansSerifSmall"
-      text_color="White_50"
-      width="190"
-      follows="top|left"
-      layout="topleft"
-      mouse_opaque="false"
-     type="string"
-     height="16"
-     length="1"
-     left_pad="10"
-     name="prepend_founded_by"
-     top_delta="0">
-      Founder:
-    </text>
-    <name_box
-     follows="left|top"
-     height="16"
-     initial_value="(retrieving)"
-     layout="topleft"
-     left_delta="0"
-     link="true"
-     name="founder_name"
-     top_pad="2"
-     use_ellipses="true"
-     width="190" />
-    <text
-    font="SansSerifMedium"
-    text_color="EmphasisColor"
-     type="string"
-     follows="left|top"
-     height="16"
-     layout="topleft"
-     left_delta="0"
-     name="join_cost_text"
-     top_pad="10"
-     visible="true"
-     width="190">
-      Free
-    </text>
-    <button
-     follows="left|top"
-     left_delta="0"
-     top_pad="6"
-     height="23"
-     label="JOIN NOW!"
-     name="btn_join"
-     visible="true"
-     width="120" />
     </panel>
    <layout_stack
      name="layout"
@@ -137,7 +77,7 @@ background_visible="true"
       follows="all"
      left="0"
      top_pad="0"
-     height="437"
+     height="537"
      width="313"
      border_size="0">
    <layout_panel
-- 
cgit v1.2.3


From ff2296723339af6a1aead36534565856221a467e Mon Sep 17 00:00:00 2001
From: Dmitry Zaporozhan <dzaporozhan@productengine.com>
Date: Wed, 10 Feb 2010 13:03:11 +0200
Subject: Fixed low bug EXT-5124 - Display buddy icons on online/offline alerts

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 90381c2af4..51f0f6839c 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4307,14 +4307,14 @@ Topic: [SUBJECT], Message: [MESSAGE]
    icon="notifytip.tga"
    name="FriendOnline"
    type="notifytip">
-[FIRST] [LAST] is Online
+[NAME_SLURL] is Online
   </notification>
 
   <notification
    icon="notifytip.tga"
    name="FriendOffline"
    type="notifytip">
-[FIRST] [LAST] is Offline
+[NAME_SLURL] is Offline
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 3eeb4e6599a87595d13b500074a22d88a1509983 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 14:35:29 +0200
Subject: partitial fix for normal task EXT-2957 [BSI] Implement object icon
 for chat from objects, instead of using generic image for missing profile
 picture

--HG--
branch : product-engine
---
 .../newview/skins/default/textures/icons/object_icon.png  | Bin 0 -> 973 bytes
 indra/newview/skins/default/textures/textures.xml         |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 indra/newview/skins/default/textures/icons/object_icon.png

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png
new file mode 100644
index 0000000000..c9fbde987a
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/object_icon.png differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 309c2a5f30..18d1779702 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -515,6 +515,7 @@ with the same filename but different name
   <texture name="SliderThumb_Press" file_name="widgets/SliderThumb_Press.png" />
 
   <texture name="SL_Logo" file_name="icons/SL_Logo.png" preload="true" />
+  <texture name="OBJECT_Icon" file_name="icons/object_icon.png" preload="true" />
 
   <texture name="Snapshot_Off" file_name="bottomtray/Snapshot_Off.png" preload="true" scale.left="4" scale.top="19" scale.right="22" scale.bottom="4" />
   <texture name="Snapshot_Over" file_name="bottomtray/Snapshot_Over.png" preload="false" />
-- 
cgit v1.2.3


From 3e9e874ab467dd33ff9ea542ac0834e9fe40377d Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 14:41:58 +0200
Subject: modified icon from ticket EXT-2957

--HG--
branch : product-engine
---
 .../skins/default/textures/icons/object_icon.png        | Bin 973 -> 410 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/icons/object_icon.png b/indra/newview/skins/default/textures/icons/object_icon.png
index c9fbde987a..223874e631 100644
Binary files a/indra/newview/skins/default/textures/icons/object_icon.png and b/indra/newview/skins/default/textures/icons/object_icon.png differ
-- 
cgit v1.2.3


From 15825cb8992ce692172907714c7cd64a48ed5fa4 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Wed, 10 Feb 2010 14:20:23 +0000
Subject: fix 9d63853d2045 / EXT-651 that checkin broke the xml and killed the
 Developer menu - repair it.

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 4e9073bea5..df6c7bd9cb 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1604,6 +1604,7 @@
                parameter="" />
             <menu_item_call.on_enable
                function="File.EnableUpload" />
+            </menu_item_call>
             <menu_item_check
                label="Search"
                layout="topleft"
-- 
cgit v1.2.3