summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2012-01-15 10:04:41 -0500
committerJonathan Yap <none@none>2012-01-15 10:04:41 -0500
commitc0d2d316bef9157fcf80e7ee33aff38b55410f16 (patch)
tree73a4c11aad69e4bb37f709f6664ddd6e1138838b
parent3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff)
STORM-1796 Preferences->Privacy->Only friends and groups can call or IM me cannot be changed unless Voice Chat is enabled
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml1
2 files changed, 1 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 84f399cc89..30cc447bbf 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 47236c1a48..587c461bee 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"