From 483ceba5f492430ddd4f3b5c8c9d0fdfe12f2a6f Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Fri, 6 May 2011 13:36:08 -0700
Subject: [PATCH] EXP-769: "Group call requests received in Basic mode" fixing
merge error
---
indra/newview/app_settings/settings_minimal.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml
index 9c6418b1f04..d3f0ec5dad6 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>
--
GitLab