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

This commit is contained in:
Siana Gearz
2013-01-02 23:00:46 +01:00
980 changed files with 2777 additions and 494 deletions

View File

@@ -275,13 +275,13 @@
<map/>
<key>osMessageAttachments</key>
<map/>
<key>osDropAttachments</key>
<key>osDropAttachment</key>
<map/>
<key>osDropAttachmentsAt</key>
<key>osDropAttachmentAt</key>
<map/>
<key>osForceDropAttachments</key>
<key>osForceDropAttachment</key>
<map/>
<key>osForceDropAttachmentsAt</key>
<key>osForceDropAttachmentAt</key>
<map/>
<key>osListenRegex</key>
<map/>

View File

@@ -760,6 +760,28 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>OtherChatsTornOff</key>
<map>
<key>Comment</key>
<string>When true, chats other than local chat open torn off of the Communicate window.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>OtherChatsTornOffAndMinimized</key>
<map>
<key>Comment</key>
<string>When this and OtherChatsTornOff are true, new chats open torn off and minimized.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>MarketImporterUpdateFreq</key>
<map>
<key>Comment</key>
@@ -854,6 +876,28 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AnnounceSnapshots</key>
<map>
<key>Comment</key>
<string>Announce if someone nearby has taken a snapshot in chat (Won't work on people who hide/quiet snapshots)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AnnounceStreamMetadata</key>
<map>
<key>Comment</key>
<string>Announce the metadata of the track playing, in chat, during streams.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>InventorySortOrder</key>
<map>
<key>Comment</key>
@@ -5824,6 +5868,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SecondsInLog</key>
<map>
<key>Comment</key>
<string>TRUE to add seconds to timestamps for Log</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FloaterAboutRect</key>
<map>
<key>Comment</key>

View File

@@ -135,7 +135,7 @@
<key>AscentFriendColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<string>Special color to distinguish friends from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -153,7 +153,7 @@
<key>AscentLindenColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<string>Special color to distinguish Lindens(/grid operators) from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -171,7 +171,7 @@
<key>AscentMutedColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<string>Special color to distinguish those who have been muted from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -189,7 +189,7 @@
<key>AscentEstateOwnerColor</key>
<map>
<key>Comment</key>
<string>Color of chat messages from other residents</string>
<string>Special color to distinguish estate owners from other residents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -204,7 +204,59 @@
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentReportClientUUID</key>
<key>ColorFriendChat</key>
<map>
<key>Comment</key>
<string>Color chat from friends using AscentFriendColor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>ColorLindenChat</key>
<map>
<key>Comment</key>
<string>Color chat from Lindens(/grid operators) using AscentLindenColor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>ColorMutedChat</key>
<map>
<key>Comment</key>
<string>Color chat from muted residents using AscentMutedColor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>ColorEstateOwnerChat</key>
<map>
<key>Comment</key>
<string>Color chat from estate owners using AscentEstateOwnerColor</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<key>IsCOA</key>
<integer>1</integer>
</map>
<key>AscentReportClientUUID</key>
<map>
<key>Comment</key>
<string>Broadcasted Client Key</string>