Merge viewer-legacy-profiles

2019-08-19 22:18:50 +02:00 · 2019-08-19 22:18:50 +02:00 · facd9ee175
parent b5066b3d18 dc3a9970d2
commit facd9ee175
5 changed files with 5 additions and 0 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -224,6 +224,7 @@ Ansariel Hiller
 	MAINT-8723
 	SL-10385
 	SL-10891
+	SL-10675
 Aralara Rajal
 Arare Chantilly
 	CHUIBUG-191
--- 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"
--- 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"
--- 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"
--- a/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
@ -473,6 +473,7 @@
         bevel_style="in" />
        <text_editor
         name="sl_description_edit"
+         trusted_content="false"
         enabled="false"
         top="1"
         left="59"