From e13d8087ea1ce652a2652fa3903c2b963a9d71bf Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Tue, 6 Oct 2015 16:11:42 +0300
Subject: MAINT-5694 FIXED Links on the 1st line of a group notice message are
 sometimes not clickable.

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

(limited to 'indra')

diff --git a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
index 0c173261a3..a909028f9f 100644
--- a/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_notification_list_item.xml
@@ -97,7 +97,7 @@
                         Notice Title Notice Title N o t i c e T i t l e N o t i c e T i t l e
                       </text>
                       <text allow_scroll="false" font="SansSerif" left="0" width="233" height="10" layout="topleft" follows="right|left" text_color="White"
-                        use_ellipses="true" word_wrap="false" mouse_opaque="false" name="group_name_exp" visible="false">
+                        use_ellipses="true" word_wrap="false" mouse_opaque="false" name="group_name_exp" parse_urls="false" visible="false">
                         Group Name Group Name Group Na m e e
                       </text>
                     </panel>
@@ -109,7 +109,7 @@
                       <text allow_scroll="false" font="SansSerifSmall" top="0" right="-1" width="95" height="13" follows="right" halign="right" layout="topleft" left_pad="5"
                         name="notification_time_exp" value="2014/12/24 23:30" />
                     </panel>
-                    <panel border="false" left="0" height="115" width="230" bevel_style="none" follows="left|right" layout="topleft" name="notification_text_panel_exp" visible="true">
+                    <panel border="false" left="0" height="115" width="230" bevel_style="none" follows="all" layout="topleft" name="notification_text_panel_exp" visible="true">
                       <chat_editor is_expandable="true" top="0" left="0" width="230" height="110" layout="topleft" follows="left|right"
                             word_wrap="true" max_length="65536" name="notification_text_exp" parse_urls="true">
                         Notice text goes here b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a b l a bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla bla. bla bla bla bla bla bla bla bla bla bla bla bla bla .
-- 
cgit v1.2.3


From bbedc51d1df3a9705deda43c0c267be45846acff Mon Sep 17 00:00:00 2001
From: Mnikolenko ProductEngine <mnikolenko@productengine.com>
Date: Thu, 8 Oct 2015 17:06:04 +0300
Subject: MAINT-5708 FIXED Images shouldn't be displayed in notification titles

---
 indra/newview/llnotificationlistitem.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra')

diff --git a/indra/newview/llnotificationlistitem.cpp b/indra/newview/llnotificationlistitem.cpp
index 8005fa6239..f0159149d1 100644
--- a/indra/newview/llnotificationlistitem.cpp
+++ b/indra/newview/llnotificationlistitem.cpp
@@ -75,6 +75,10 @@ BOOL LLNotificationListItem::postBuild()
     mNoticeTextExp->setEnabled(FALSE);
     mNoticeTextExp->setTextExpandedCallback(boost::bind(&LLNotificationListItem::reshapeNotification, this));
 
+    mTitleBox->setContentTrusted(false);
+    mTitleBoxExp->setContentTrusted(false);
+    mNoticeTextExp->setContentTrusted(false);
+
     mTimeBox->setValue(buildNotificationDate(mParams.time_stamp));
     mTimeBoxExp->setValue(buildNotificationDate(mParams.time_stamp));
 
-- 
cgit v1.2.3