Scott Lawrence avatar 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"
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.