summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/floater_conversation_log.xml
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-09-13 11:23:37 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-09-13 11:23:37 -0700
commit6b597ad40dcec2f494988eddf76376ae439c1059 (patch)
treedb15452f572d5c0ca39ba7e9f82e23c86573b8b7 /indra/newview/skins/default/xui/en/floater_conversation_log.xml
parent2084d33c1ec827b4e8d975a3bf1232e971f704e2 (diff)
parenta6370cf4a72371e090d45f2a147929d016f42780 (diff)
merging in latest changes
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_conversation_log.xml')
-rw-r--r--indra/newview/skins/default/xui/en/floater_conversation_log.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
index 9cdeb0d788..df78bbccec 100644
--- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml
+++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml
@@ -13,6 +13,11 @@
reuse_instance="true"
title="CONVERSATION LOG"
width="450">
+
+ <string name="logging_calls_disabled">
+ Conversations are not being logged. To log conversations in the future, select "Save IM logs in my computer" under Preferences > Privacy.
+ </string>
+
<panel
follows="left|top|right"
height="27"