FIRE-17995: Urls without protocol randomly get broken

Wed, 23 Mar 2016 16:44:05 +0100

author
Ansariel
date
Wed, 23 Mar 2016 16:44:05 +0100
changeset 48932
680ad57c187a
parent 48931
37021f68c712
child 48933
45a1ba4a9428

FIRE-17995: Urls without protocol randomly get broken

Replace LLViewerTextEditor with the basic LLTextEditor because LLViewerTextEditor
will parse the text again after it's being added and replace URLs with their
label, assuming the user is going to edit the text - which is not the case here.

indra/newview/lltoastgroupnotifypanel.cpp file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/de/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/ansastorm/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/de/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/es/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/ja/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/tr/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/zh/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/de/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/firestorm/xui/es/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/latency/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/metaharper/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/metaharper/xui/es/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/starlight/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/starlightcui/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/en/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/es/panel_group_notify.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/ja/panel_group_notify.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/lltoastgroupnotifypanel.cpp	Tue Mar 22 09:53:54 2016 +0100
     1.2 +++ b/indra/newview/lltoastgroupnotifypanel.cpp	Wed Mar 23 16:44:05 2016 +0100
     1.3 @@ -113,7 +113,10 @@
     1.4  	substitution["datetime"] = (S32) notice_date.secondsSinceEpoch();
     1.5  	LLStringUtil::format(timeStr, substitution);
     1.6  
     1.7 -	LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
     1.8 +	// <FS:Ansariel> FIRE-17995: Urls without protocol randomly get broken
     1.9 +	//LLViewerTextEditor* pMessageText = getChild<LLViewerTextEditor>("message");
    1.10 +	LLTextEditor* pMessageText = getChild<LLTextEditor>("message");
    1.11 +	// </FS:Ansariel>
    1.12  	pMessageText->setContentTrusted(false);
    1.13  	pMessageText->clear();
    1.14  
     2.1 --- a/indra/newview/skins/ansastorm/xui/de/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     2.2 +++ b/indra/newview/skins/ansastorm/xui/de/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     2.3 @@ -1,12 +1,8 @@
     2.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     2.5  <panel label="instant_message" name="panel_group_notify">
     2.6 -	<string name="message_max_lines_count" value="7"/>
     2.7 -	<string name="subject_font" value="SANSSERIF_BIG"/>
     2.8 -	<string name="date_font" value="SANSSERIF"/>
     2.9  	<panel label="Überschrift" name="header">
    2.10  		<text name="title" value="Absender/Gruppenname"/>
    2.11  	</panel>
    2.12 -	<text_editor name="message" value="Nachricht"/>
    2.13  	<text name="attachment" value="Anhang"/>
    2.14  	<text name="group_notice" value="Gruppenmitteilung"/>
    2.15  	<button label="OK" name="btn_ok"/>
     3.1 --- a/indra/newview/skins/ansastorm/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     3.2 +++ b/indra/newview/skins/ansastorm/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     3.3 @@ -52,7 +52,7 @@
     3.4       name="group_icon"
     3.5       top="50"
     3.6       width="64" />
     3.7 -    <text_editor
     3.8 +    <simple_text_editor
     3.9       parse_urls="true"
    3.10       enabled="true"
    3.11       follows="all"
    3.12 @@ -70,7 +70,7 @@
    3.13       use_ellipses="true"
    3.14       value="message"
    3.15       word_wrap="true" >
    3.16 -    </text_editor>
    3.17 +    </simple_text_editor>
    3.18      <icon
    3.19       bottom="-36"
    3.20       follows="left|bottom|right"
     4.1 --- a/indra/newview/skins/default/xui/de/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     4.2 +++ b/indra/newview/skins/default/xui/de/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     4.3 @@ -1,12 +1,8 @@
     4.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     4.5  <panel label="instant_message" name="panel_group_notify">
     4.6 -	<string name="message_max_lines_count" value="7"/>
     4.7 -	<string name="subject_font" value="SANSSERIF_BIG"/>
     4.8 -	<string name="date_font" value="SANSSERIF"/>
     4.9  	<panel label="Überschrift" name="header">
    4.10  		<text name="title" value="Absender/Gruppenname"/>
    4.11  	</panel>
    4.12 -	<text_editor name="message" value="Nachricht"/>
    4.13  	<text name="attachment" value="Anhang"/>
    4.14  	<button label="OK" name="btn_ok"/>
    4.15  </panel>
     5.1 --- a/indra/newview/skins/default/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     5.2 +++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     5.3 @@ -49,7 +49,7 @@
     5.4           value="Sender Name / Group Name"
     5.5           width="230" />
     5.6      </panel>
     5.7 -    <text_editor
     5.8 +    <simple_text_editor
     5.9       parse_urls="true"
    5.10       enabled="true"
    5.11       follows="all"
    5.12 @@ -67,7 +67,7 @@
    5.13       value="message"
    5.14       width="270"
    5.15  	 word_wrap="true" >
    5.16 -    </text_editor>
    5.17 +    </simple_text_editor>
    5.18      <icon
    5.19       bottom="60"
    5.20       follows="left|bottom|right"
     6.1 --- a/indra/newview/skins/default/xui/es/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     6.2 +++ b/indra/newview/skins/default/xui/es/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     6.3 @@ -3,7 +3,6 @@
     6.4  	<panel label="cabecera" name="header">
     6.5  		<text name="title" value="Enviado por Remitente, Grupo"/>
     6.6  	</panel>
     6.7 -	<text_editor name="message" value="mensaje"/>
     6.8  	<text name="attachment" value="Adjunción"/>
     6.9  	<button label="Aceptar" name="btn_ok"/>
    6.10  </panel>
     7.1 --- a/indra/newview/skins/default/xui/ja/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     7.2 +++ b/indra/newview/skins/default/xui/ja/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     7.3 @@ -1,8 +1,5 @@
     7.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     7.5  <panel label="instant_message" name="panel_group_notify">
     7.6 -	<string name="message_max_lines_count" value="7"/>
     7.7 -	<string name="subject_font" value="SANSSERIF_BIG"/>
     7.8 -	<string name="date_font" value="SANSSERIF"/>
     7.9  	<panel label="ヘッダー" name="header">
    7.10  		<text name="title" value="送信者の名前 / グループ名"/>
    7.11  	</panel>
     8.1 --- a/indra/newview/skins/default/xui/tr/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     8.2 +++ b/indra/newview/skins/default/xui/tr/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     8.3 @@ -1,8 +1,5 @@
     8.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     8.5  <panel label="instant_message" name="panel_group_notify">
     8.6 -	<string name="message_max_lines_count" value="7"/>
     8.7 -	<string name="subject_font" value="SANSSERIF_BIG"/>
     8.8 -	<string name="date_font" value="SANSSERIF"/>
     8.9  	<panel label="başlık" name="header">
    8.10  		<text name="title" value="Gönderici Adı / Grup Adı"/>
    8.11  	</panel>
     9.1 --- a/indra/newview/skins/default/xui/zh/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
     9.2 +++ b/indra/newview/skins/default/xui/zh/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
     9.3 @@ -1,8 +1,5 @@
     9.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
     9.5  <panel label="即時訊息" name="panel_group_notify">
     9.6 -	<string name="message_max_lines_count" value="7"/>
     9.7 -	<string name="subject_font" value="SANSSERIF_BIG"/>
     9.8 -	<string name="date_font" value="SANSSERIF"/>
     9.9  	<panel label="表頭" name="header">
    9.10  		<text name="title" value="發件者名/群組名"/>
    9.11  	</panel>
    10.1 --- a/indra/newview/skins/firestorm/xui/de/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    10.2 +++ b/indra/newview/skins/firestorm/xui/de/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    10.3 @@ -1,12 +1,8 @@
    10.4  <?xml version="1.0" encoding="utf-8" standalone="yes"?>
    10.5  <panel label="instant_message" name="panel_group_notify">
    10.6 -	<string name="message_max_lines_count" value="7"/>
    10.7 -	<string name="subject_font" value="SANSSERIF_BIG"/>
    10.8 -	<string name="date_font" value="SANSSERIF"/>
    10.9  	<panel label="Überschrift" name="header">
   10.10  		<text name="title" value="Absender/Gruppenname"/>
   10.11  	</panel>
   10.12 -	<text_editor name="message" value="Nachricht"/>
   10.13  	<text name="attachment" value="Anhang"/>
   10.14  	<text name="group_notice" value="Gruppenmitteilung"/>
   10.15  	<button label="OK" name="btn_ok"/>
    11.1 --- a/indra/newview/skins/firestorm/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    11.2 +++ b/indra/newview/skins/firestorm/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    11.3 @@ -52,7 +52,7 @@
    11.4       name="group_icon"
    11.5       top="50"
    11.6       width="64" />
    11.7 -    <text_editor
    11.8 +    <simple_text_editor
    11.9       parse_urls="true"
   11.10       enabled="true"
   11.11       follows="all"
   11.12 @@ -70,7 +70,7 @@
   11.13       use_ellipses="true"
   11.14       value="message"
   11.15       word_wrap="true" >
   11.16 -    </text_editor>
   11.17 +    </simple_text_editor>
   11.18      <icon
   11.19       bottom="-36"
   11.20       follows="left|bottom|right"
    12.1 --- a/indra/newview/skins/firestorm/xui/es/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    12.2 +++ b/indra/newview/skins/firestorm/xui/es/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    12.3 @@ -2,7 +2,6 @@
    12.4  <panel label="instant_message" name="panel_group_notify">
    12.5  	<text name="group_notice" value="Aviso de grupo"/>
    12.6  	<text name="title" value="Enviado por Nombre del emisor / Nombre del grupo"/>
    12.7 -	<text_editor name="message" value="mensaje"/>
    12.8  	<text name="attachment" value="Adjunción"/>
    12.9  	<button label="Aceptar" name="btn_ok"/>
   12.10  	<button label="Avisos del grupo" name="btn_notices"/>
    13.1 --- a/indra/newview/skins/latency/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    13.2 +++ b/indra/newview/skins/latency/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    13.3 @@ -56,7 +56,7 @@
    13.4  		name="group_icon"
    13.5  		top_pad="4"
    13.6  		width="64" />
    13.7 -	<text_editor
    13.8 +	<simple_text_editor
    13.9  		bg_readonly_color="Transparent"
   13.10  		border_visible="true"
   13.11  		parse_urls="true"
    14.1 --- a/indra/newview/skins/metaharper/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    14.2 +++ b/indra/newview/skins/metaharper/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    14.3 @@ -52,7 +52,7 @@
    14.4       name="group_icon"
    14.5       top="50"
    14.6       width="64" />
    14.7 -    <text_editor
    14.8 +    <simple_text_editor
    14.9       parse_urls="true"
   14.10       enabled="true"
   14.11       follows="all"
   14.12 @@ -70,7 +70,7 @@
   14.13       use_ellipses="true"
   14.14       value="message"
   14.15       word_wrap="true" >
   14.16 -    </text_editor>
   14.17 +    </simple_text_editor>
   14.18      <icon
   14.19       bottom="-36"
   14.20       follows="left|bottom|right"
    15.1 --- a/indra/newview/skins/metaharper/xui/es/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    15.2 +++ b/indra/newview/skins/metaharper/xui/es/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    15.3 @@ -2,7 +2,6 @@
    15.4  <panel name="panel_group_notify">
    15.5  	<text name="group_notice" value="Aviso de grupo"/>
    15.6  	<text name="title" value="Enviado por Remitente, Grupo"/>
    15.7 -	<text_editor name="message" value="Mensaje"/>
    15.8  	<text name="attachment" value="Adjunción"/>
    15.9  	<button label="Aceptar" name="btn_ok"/>
   15.10  	<button label="Avisos del grupo" name="btn_notices"/>
    16.1 --- a/indra/newview/skins/starlight/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    16.2 +++ b/indra/newview/skins/starlight/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    16.3 @@ -50,7 +50,7 @@
    16.4           value="Sender Name / Group Name"
    16.5           width="230" />
    16.6      </panel>
    16.7 -    <text_editor
    16.8 +    <simple_text_editor
    16.9       parse_urls="true"
   16.10       enabled="true"
   16.11       follows="all"
   16.12 @@ -68,7 +68,7 @@
   16.13       value="message"
   16.14       width="270"
   16.15  	 word_wrap="true" >
   16.16 -    </text_editor>
   16.17 +    </simple_text_editor>
   16.18      <icon
   16.19       bottom="60"
   16.20       follows="left|bottom|right"
    17.1 --- a/indra/newview/skins/starlightcui/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    17.2 +++ b/indra/newview/skins/starlightcui/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    17.3 @@ -50,7 +50,7 @@
    17.4           value="Sender Name / Group Name"
    17.5           width="230" />
    17.6      </panel>
    17.7 -    <text_editor
    17.8 +    <simple_text_editor
    17.9       parse_urls="true"
   17.10       enabled="true"
   17.11       follows="all"
   17.12 @@ -68,7 +68,7 @@
   17.13       value="message"
   17.14       width="270"
   17.15  	 word_wrap="true" >
   17.16 -    </text_editor>
   17.17 +    </simple_text_editor>
   17.18      <icon
   17.19       bottom="60"
   17.20       follows="left|bottom|right"
    18.1 --- a/indra/newview/skins/vintage/xui/en/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    18.2 +++ b/indra/newview/skins/vintage/xui/en/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    18.3 @@ -56,7 +56,7 @@
    18.4  		name="group_icon"
    18.5  		top_pad="2"
    18.6  		width="64" />
    18.7 -	<text_editor
    18.8 +	<simple_text_editor
    18.9  		bg_readonly_color="GroupNotifyTextBG"
   18.10  		border_visible="true"
   18.11  		parse_urls="true"
    19.1 --- a/indra/newview/skins/vintage/xui/es/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    19.2 +++ b/indra/newview/skins/vintage/xui/es/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    19.3 @@ -2,7 +2,6 @@
    19.4  <panel name="panel_group_notify">
    19.5  	<text name="group_notice" value="Aviso de grupo"/>
    19.6  	<text name="title" value="Enviado por Remitente / Nombre de grupo"/>
    19.7 -	<text_editor name="message" value="Mensaje"/>
    19.8  	<text name="attachment_label" value="Adjunto:"/>
    19.9  	<panel name="attachment_container">
   19.10  		<text name="attachment" value="Adjunción"/>
    20.1 --- a/indra/newview/skins/vintage/xui/ja/panel_group_notify.xml	Tue Mar 22 09:53:54 2016 +0100
    20.2 +++ b/indra/newview/skins/vintage/xui/ja/panel_group_notify.xml	Wed Mar 23 16:44:05 2016 +0100
    20.3 @@ -6,7 +6,6 @@
    20.4  	<text name="group_notice" value="グループ通知" />
    20.5  	<text name="title" value="送信者の名前 / グループ名"  />
    20.6  	<icon name="group_icon" />
    20.7 -	<text_editor name="message" value="メッセージ" />
    20.8  	<text name="attachment_label" value="添付:" />
    20.9  	<panel name="attachment_container">
   20.10  		<icon name="attachment_icon" />

mercurial