summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-09-22 15:28:13 -0600
committerDave Houlton <euclid@lindenlab.com>2020-09-22 15:28:13 -0600
commit86e7cc3d35e41a88b25175bafb5687e1864423d9 (patch)
treea5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/newview/app_settings/settings.xml
parentb62d7c2f06fdaa91312fd6857d03748defe8b60f (diff)
parent60ed688026269568a9eef67437dc780f88c92871 (diff)
Merge branch 'master' v6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 39724e20cc..8d5a97d1cb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14409,7 +14409,7 @@
<key>VoiceCallsFriendsOnly</key>
<map>
<key>Comment</key>
- <string>Only accept voice calls from residents on your friends list</string>
+ <string>(Deprecated) Only accept voice calls from residents on your friends list</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>