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

This commit is contained in:
Siana Gearz
2013-01-03 02:17:20 +01:00
58 changed files with 3575 additions and 1462 deletions

View File

@@ -6776,6 +6776,22 @@ This should be as low as possible, but too low may break functionality</string>
<integer>0</integer>
</array>
</map>
<key>FloaterOutboxRect</key>
<map>
<key>Comment</key>
<string>Rectangle for merchant outbox window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>342</integer>
<integer>310</integer>
<integer>52</integer>
</array>
</map>
<key>FloaterPayRectB</key>
<map>
<key>Comment</key>
@@ -6856,6 +6872,38 @@ This should be as low as possible, but too low may break functionality</string>
<integer>400</integer>
</array>
</map>
<key>FloaterSnapshotFeedRect</key>
<map>
<key>Comment</key>
<string>Rectangle for snapshot feed window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>200</integer>
<integer>200</integer>
<integer>400</integer>
</array>
</map>
<key>FloaterSnapshotPostcardRect</key>
<map>
<key>Comment</key>
<string>Rectangle for snapshot postcard window</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Rect</string>
<key>Value</key>
<array>
<integer>0</integer>
<integer>346</integer>
<integer>450</integer>
<integer>400</integer>
</array>
</map>
<key>FloaterSoundsRect</key>
<map>
<key>Comment</key>
@@ -8163,17 +8211,6 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>64</integer>
</map>
<key>KeepAspectForSnapshot</key>
<map>
<key>Comment</key>
<string>Use full window when taking snapshot, regardless of requested image size</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>LandBrushSize</key>
<map>
<key>Comment</key>
@@ -8344,6 +8381,50 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<string>0.0.0</string>
</map>
<key>LastSnapshotToFeedAspect</key>
<map>
<key>Comment</key>
<string>The aspect ratio spinner value for snapshots uploaded to my.secondlife.com</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>1.33333</integer>
</map>
<key>LastSnapshotToFeedHeight</key>
<map>
<key>Comment</key>
<string>The height of the last my.secondlife.com feed snapshot, in px</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>525</integer>
</map>
<key>LastSnapshotToFeedWidth</key>
<map>
<key>Comment</key>
<string>The width of the last my.secondlife.com feed snapshot, in px</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>700</integer>
</map>
<key>LastSnapshotToEmailAspect</key>
<map>
<key>Comment</key>
<string>The aspect ratio spinner value for snapshots sent by email</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LastSnapshotToEmailHeight</key>
<map>
<key>Comment</key>
@@ -8366,6 +8447,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1024</integer>
</map>
<key>LastSnapshotToDiskAspect</key>
<map>
<key>Comment</key>
<string>The aspect ratio spinner value for snapshots written to disk</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LastSnapshotToDiskHeight</key>
<map>
<key>Comment</key>
@@ -8388,6 +8480,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1024</integer>
</map>
<key>LastSnapshotToInventoryAspect</key>
<map>
<key>Comment</key>
<string>The aspect ratio spinner value for snapshots uploaded to inventory</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LastSnapshotToInventoryHeight</key>
<map>
<key>Comment</key>
@@ -8421,6 +8524,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotFeedAddLocation</key>
<map>
<key>Comment</key>
<string>Include your location in your uploads to profile feed.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LeftClickShowMenu</key>
<map>
<key>Comment</key>
@@ -13686,6 +13800,28 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotFeedLastAspect</key>
<map>
<key>Comment</key>
<string>Take next feed snapshot at this aspect</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotFeedLastResolution</key>
<map>
<key>Comment</key>
<string>Take next feed snapshot at this resolution</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotFormat</key>
<map>
<key>Comment</key>
@@ -13697,6 +13833,28 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotLayerType</key>
<map>
<key>Comment</key>
<string>Save snapshots in this format (0 = Colors, 1 = Depth)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotLocalLastAspect</key>
<map>
<key>Comment</key>
<string>Take next local snapshot at this aspect</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotLocalLastResolution</key>
<map>
<key>Comment</key>
@@ -13708,6 +13866,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotPostcardLastAspect</key>
<map>
<key>Comment</key>
<string>Take next postcard snapshot at this aspect</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotPostcardLastResolution</key>
<map>
<key>Comment</key>
@@ -13730,6 +13899,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>75</integer>
</map>
<key>SnapshotTextureLastAspect</key>
<map>
<key>Comment</key>
<string>Take next texture snapshot at this aspect</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotTextureLastResolution</key>
<map>
<key>Comment</key>
@@ -13741,6 +13921,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SnapshotOpenFreezeTime</key>
<map>
<key>Comment</key>
<string>When opening the snapshot floater, immediately freeze time.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>SpeakingColor</key>
<map>
<key>Comment</key>
@@ -14453,12 +14644,12 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>UseFreezeFrame</key>
<key>UseFreezeTime</key>
<map>
<key>Comment</key>
<string>Freeze time when taking snapshots.</string>
<key>Persist</key>
<integer>1</integer>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>