diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-08-08 13:55:01 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-08-08 13:55:01 +0000 |
| commit | ed17ca7885548f517bdf4c42c4c7987a02f28840 (patch) | |
| tree | b2796cf73b0f54930e1f54341c8368becfba66b3 | |
| parent | da4d270695610de8f8a49c33cc5c74aca06234bf (diff) | |
| parent | b70eb72b9ddbcb0adfd8dc2d6cfff85caa7c39b0 (diff) | |
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #671)
MAINT-8856 Fixed URL behavior in group call popups
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_outgoing_call.xml | 18 |
1 files changed, 12 insertions, 6 deletions
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 d714cc613e..ae1fb4cccd 100644 --- a/indra/newview/skins/default/xui/en/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/en/floater_outgoing_call.xml @@ -57,7 +57,8 @@ top="27" visible="false" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Connecting to [CALLEE_NAME] </text> <text @@ -68,7 +69,8 @@ Connecting to [CALLEE_NAME] name="calling" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Calling [CALLEE_NAME] </text> <text @@ -90,7 +92,8 @@ No Answer. Please try again later. name="nearby" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> You have been disconnected from [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> <text @@ -101,7 +104,8 @@ No Answer. Please try again later. name="nearby_P2P_by_other" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Your call has ended. [RECONNECT_NEARBY] </text> <text @@ -112,7 +116,8 @@ No Answer. Please try again later. name="nearby_P2P_by_agent" top="27" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> You have ended the call. [RECONNECT_NEARBY] </text> <text @@ -123,7 +128,8 @@ No Answer. Please try again later. name="leaving" top="62" width="315" - word_wrap="true"> + word_wrap="true" + parse_urls="false"> Leaving [CURRENT_CHAT]. </text> <button |