summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings_minimal.xml
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-05-03 15:00:49 -0700
committerRichard Linden <none@none>2011-05-03 15:00:49 -0700
commit29a2e3f2a4cf7c57adb7a6bfcd71ac960867288d (patch)
treeab676a02a67a9838183bdd6239b41252fc34d058 /indra/newview/app_settings/settings_minimal.xml
parent315eee3a7c87c5ee2154013d3fa0356c80bfab2e (diff)
parentd5faa4f38d338777463b7ad6eb3239041d43fe28 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/app_settings/settings_minimal.xml')
-rw-r--r--indra/newview/app_settings/settings_minimal.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 60aecb279c..2180abdcee 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -117,10 +117,10 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>VoiceCallsRejectAll</key>
+ <key>VoiceCallsRejectGroup</key>
<map>
<key>Comment</key>
- <string>Silently reject all incoming voice calls.</string>
+ <string>Silently reject all incoming group voice calls.</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>