Merge branch 'master' of https://github.com/Shyotl/SingularityViewer

2012-11-12 04:12:57 +01:00
parent c3d76669ca eb5b1312bb
commit 562acd6e2c
35 changed files with 1935 additions and 225 deletions
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -973,6 +973,17 @@
      <key>Value</key>
      <integer>0</integer>
    </map>
+    <key>AntiSpamGroupFeeInvites</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from group invites that require an entry fee will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
    <key>AntiSpamGroupNotices</key>
    <map>
      <key>Comment</key>