From d7140c95e3a667ea5d659802956bc0aa5acfda41 Mon Sep 17 00:00:00 2001
From: Mike Antipov <mantipov@productengine.com>
Date: Wed, 10 Feb 2010 17:40:56 +0200
Subject: Fixed low bug EXT-5057 (Warning Message in console on every Group
 Chat Message recieved) - removed getting an icon commented out in xml. It
 does not make sense witout image name.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index a0ad38cf76..34fd3352a3 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -56,16 +56,6 @@
          name="adhoc_icon"
          top="3"
          width="18" />
-        <!--<icon
-         follows="right"
-         height="20"
-         image_name=""
-         layout="topleft"
-         left="3"
-         mouse_opaque="true"
-         name="sys_msg_icon"
-         top="0"
-         width="20" />-->
         <text
          follows="left|right"
          font.style="BOLD"
-- 
cgit v1.2.3


From e8610200433ef636bbd0b594afe9543cebc06689 Mon Sep 17 00:00:00 2001
From: Ychebotarev ProductEngine <ychebotarev@productengine.com>
Date: Wed, 10 Feb 2010 20:03:20 +0200
Subject: zmg fix for normal EXT-5245 Cannot create a new line in group notice
 creation with enter key

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml
index 1f16aea2ef..5f46ad7860 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml
@@ -159,7 +159,6 @@ Maximum 200 per group daily
          left_pad="3"
          max_length="511"
          name="create_message"
-         text_type="ascii"
          top_delta="0"
          width="220"
          word_wrap="true" />
-- 
cgit v1.2.3


From 7403d53e68550159cb56e44cc898e337cf672aae Mon Sep 17 00:00:00 2001
From: Andrew Dyukov <adyukov@productengine.com>
Date: Wed, 10 Feb 2010 21:42:39 +0200
Subject: Fixed normal bug  EXT-4566 ([BSI] private chat end floater reports
 incorrectly who ended the call)

- Added flag to voicechannel which is true when call is ended by agent.

- It is sent to imview via signal and used to properly customize text in outgoing call floater.

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

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
index cc9afe4474..2bafd1bdef 100644
--- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
+++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml
@@ -96,12 +96,23 @@ No Answer.  Please try again later.
    height="40"
    layout="topleft"
    left="77"
-   name="nearby_P2P"
+   name="nearby_P2P_by_other"
    top="27"
    width="315"
    word_wrap="true">
     [VOICE_CHANNEL_NAME] has ended the call.  [RECONNECT_NEARBY]
   </text>
+  <text
+   font="SansSerifLarge"
+   height="40"
+   layout="topleft"
+   left="77"
+   name="nearby_P2P_by_agent"
+   top="27"
+   width="315"
+   word_wrap="true">
+    You have ended the call.  [RECONNECT_NEARBY]
+  </text>
   <text
      font="SansSerif"
      height="50"
-- 
cgit v1.2.3


From 0e035fd9b8090c59cc7388809ebe0bf25b54cd9d Mon Sep 17 00:00:00 2001
From: "Paul Guslisty pguslisty@productengine.com"
 <Paul Guslisty pguslisty@productengine.com>
Date: Thu, 11 Feb 2010 09:41:20 +0200
Subject: Fixed normal bug EXT - 5104 (Remove names from below Profile image in
 IM windows)

- removed LLTextBox containing avatar name from IM control panel(panel_im_control_panel.xml) and corresponding code in LLPanelIMControlPanel
---
 indra/newview/skins/default/xui/en/panel_im_control_panel.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'indra/newview/skins')

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 c7e5b25e06..28c4adf67c 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
@@ -11,15 +11,6 @@
      name="avatar_icon"
      top="-5"
      width="105"/>
-    <text
-     follows="top|left|right"
-     font="SansSerifLarge"
-     height="19"
-     layout="topleft"
-     name="avatar_name"
-     use_ellipses="true"
-     value="Unknown"
-     width="110" />
     <layout_stack
      mouse_opaque="false"
      border_size="0"
@@ -30,7 +21,7 @@
      left="5"
      name="button_stack"
      orientation="vertical"
-     top_pad="-5"
+     top_pad="5"
      width="105">
         <layout_panel
          mouse_opaque="false"
-- 
cgit v1.2.3