Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-09-15 17:05:50 +02:00
parent 65781e6080 10f09dc15d
commit b0ea103c61
24 changed files with 782 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/app_settings/settings.xml
View File

@@ -1042,7 +1042,7 @@
<key>_NACL_AntiSpamGlobalQueue</key>
<map>
<key>Comment</key>
<string>Collect spamtypes together, instead of individually counting them</string>
<string>Collect spamtypes together, instead of individually counting them; Use in cases of extreme spam, only.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -1053,7 +1053,7 @@
<key>_NACL_AntiSpamTime</key>
<map>
<key>Comment</key>
<string>Time in seconds for spamtype to accumulate the _NACL_AntiSpamAmount and be blocked</string>
<string>Time in seconds for spamtype to accumulate to more than _NACL_AntiSpamAmount and be blocked</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -1064,7 +1064,7 @@
<key>_NACL_AntiSpamAmount</key>
<map>
<key>Comment</key>
<string>Amount of spamtype to be reached before the blocking will occur.</string>
<string>Count of spamtype to be reached during _NACL_AntiSpamTime before the spam blocking will occur.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -1075,7 +1075,7 @@
<key>_NACL_AntiSpamSoundMulti</key>
<map>
<key>Comment</key>
<string> </string>
<string>Multiplier for _NACL_AntiSpamTime for sounds heard in _NACL_AntiSpamTime interval needed to trigger a block, since sounds are more common than messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -1086,18 +1086,18 @@
<key>_NACL_AntiSpamNewlines</key>
<map>
<key>Comment</key>
<string>How many newlines a message can have before it's considered spam.</string>
<string>How many newlines a message is allowed to have without being considered spam.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>20</integer>
<integer>70</integer>
</map>
<key>_NACL_AntiSpamSoundPreloadMulti</key>
<map>
<key>Comment</key>
<string> </string>
<string>Multiplier for _NACL_AntiSpamTime for sounds preloaded in _NACL_AntiSpamTime interval needed to trigger a block, since sound preloads are more common than messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>