Commits

Scott Lawrence committed 5833f27 Merge

merge changes for storm-1796

Comments (0)

Files changed (2)

doc/contributions.txt

 	STORM-1733
 	STORM-1790
 	STORM-1788
+	STORM-1796
 Kadah Coba
 	STORM-1060
 Jondan Lundquist

indra/newview/skins/default/xui/en/panel_preferences_privacy.xml

      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"