summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-05-06 13:36:08 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-05-06 13:36:08 -0700
commit483ceba5f492430ddd4f3b5c8c9d0fdfe12f2a6f (patch)
treef316cccce1332aa656d91db487167014b4b932d0 /indra/newview
parent4015e6b3c7b4ff34bd679618f2231b2f53258db4 (diff)
EXP-769: "Group call requests received in Basic mode"
fixing merge error
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/settings_minimal.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 9c6418b1f0..d3f0ec5dad 100644
--- a/indra/newview/app_settings/settings_minimal.xml
+++ b/indra/newview/app_settings/settings_minimal.xml
@@ -124,7 +124,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
- <integer>0</integer>
+ <integer>1</integer>
</map>
<key>VoiceDisableMic</key>
<map>