From c0d2d316bef9157fcf80e7ee33aff38b55410f16 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Sun, 15 Jan 2012 10:04:41 -0500
Subject: [PATCH] STORM-1796 Preferences->Privacy->Only friends and groups can
call or IM me cannot be changed unless Voice Chat is enabled
---
doc/contributions.txt | 1 +
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 84f399cc893..30cc447bbfa 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -607,6 +607,7 @@ Jonathan Yap
STORM-1737
STORM-1733
STORM-1790
+ STORM-1796
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 47236c1a48b..587c461bee9 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -59,7 +59,6 @@
top_pad="30"
width="350" />
<check_box
- enabled_control="EnableVoiceChat"
control_name="VoiceCallsFriendsOnly"
height="16"
label="Only friends and groups can call or IM me"
--
GitLab