summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-02-02 23:47:48 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-02-03 20:05:20 +0200
commit1dd32bb772bb2f0d6d4f3180965a8bdcf9c1000d (patch)
tree611ed458baf6aa6754051802a5c20d506f6fc570 /indra/newview/skins/default
parent2cf9c01175b8092c3979199302bfaa3ec1471aa8 (diff)
SL-14796 After teleporting, add notation into Nearby Chat
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/colors.xml3
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml3
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 034576d30c..92398857ba 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -851,6 +851,9 @@
name="ColorSwatchBorderColor"
value="0.45098 0.517647 0.607843 1"/>
<color
+ name="ChatTeleportSeparatorColor"
+ reference="Black" />
+ <color
name="ChatTimestampColor"
reference="White" />
<color
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index db9d3bfa83..c2b5286fc3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3759,6 +3759,9 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="unread_chat_multiple">
[SOURCES] have said something new
</string>
+ <string name="teleport_preamble_compact_chat">
+ You are now at
+ </string>
<string name="session_initialization_timed_out_error">
The session initialization is timed out
</string>