From 8a3ae3a97d4e4dcd464213f34f283dd1145cfb4b Mon Sep 17 00:00:00 2001
From: AndreyL ProductEngine <alihatskiy@productengine.com>
Date: Mon, 22 Jul 2019 20:36:22 +0300
Subject: [PATCH 1/2] SL-10675 Updated contributions.txt

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 87160d2cd5..c2acb03253 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -223,6 +223,7 @@ Ansariel Hiller
 	MAINT-8723
 	SL-10385
 	SL-10891
+	SL-10675
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191

From 36feea560dbef06a32bc4c04a0d61800b7297363 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Tue, 13 Aug 2019 17:45:14 +0300
Subject: [PATCH 2/2] SL-11721 Mark description fields in legacy profiles as
 untrusted

---
 indra/newview/skins/default/xui/en/panel_profile_classified.xml | 1 +
 indra/newview/skins/default/xui/en/panel_profile_firstlife.xml  | 1 +
 indra/newview/skins/default/xui/en/panel_profile_pick.xml       | 1 +
 indra/newview/skins/default/xui/en/panel_profile_secondlife.xml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/indra/newview/skins/default/xui/en/panel_profile_classified.xml b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
index 741ea49b1e..60b13c0bc2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_classified.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_classified.xml
@@ -409,6 +409,7 @@
                      />
                     <text_editor
                      name="classified_desc"
+                     trusted_content="false"
                      value="[description]"
                      top_pad="7"
                      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
index 2f4656c2a7..7bda6d1718 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
@@ -34,6 +34,7 @@
     />
     <text_editor
      name="fl_description_edit"
+     trusted_content="false"
      enabled="false"
      top="225"
      left="6"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_pick.xml b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
index eab62d8211..47d6e9ebbd 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_pick.xml
@@ -36,6 +36,7 @@
     />
     <text_editor
      name="pick_desc"
+     trusted_content="false"
      enabled="false"
      top_pad="8"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
index 214f89b7af..38e7490864 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@@ -361,6 +361,7 @@
         />
         <text_editor
          name="sl_description_edit"
+         trusted_content="false"
          enabled="false"
          top="0"
          left="60"