Merge branch 'master' of github.com:singularity-viewer/SingularityViewer

This commit is contained in:
Siana Gearz
2013-01-20 01:49:14 +01:00
49 changed files with 1049 additions and 750 deletions

View File

@@ -6575,6 +6575,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>52</integer>
</map>
<key>RadarColumnNameWidth</key>
<map>
<key>Comment</key>
<string>Width for radar's name column</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>80</integer>
</map>
<key>RadarColumnMarkHidden</key>
<map>
<key>Comment</key>
@@ -6754,7 +6765,18 @@ This should be as low as possible, but too low may break functionality</string>
<key>RadarChatKeys</key>
<map>
<key>Comment</key>
<string>Enable private chat alerts for avatars entering the region</string>
<string>Enable alerting scripts about avatars detected by the radar</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RadarChatKeysStopAsking</key>
<map>
<key>Comment</key>
<string>Do not ask if RadarChatKeys should be enabled when a script requests for the radar's keys.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>