Merge remote-tracking branch 'shyotl/sunshine'

This commit is contained in:
Latif Khalifa
2013-01-21 11:25:10 +01:00
415 changed files with 20229 additions and 16924 deletions

View File

@@ -101,51 +101,6 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>WaterPresetName</key>
<map>
<key>Comment</key>
<string>Water preset to use. May be superseded by region settings</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<integer>Default</integer>
</map>
<key>SkyPresetName</key>
<map>
<key>Comment</key>
<string>Sky preset to use. May be superseded by region settings</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<integer>Default</integer>
</map>
<key>DayCycleName</key>
<map>
<key>Comment</key>
<string>Day Cycle to use. May be superseded by region settings</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<integer>Default</integer>
</map>
<key>UseEnvironmentFromRegion</key>
<map>
<key>Comment</key>
<string>Choose whether to use the region's environment settings, or override them with the local settings.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>UseEnvironmentFromRegionAlways</key>
<map>
<key>Comment</key>
@@ -158,17 +113,6 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>UseDayCycle</key>
<map>
<key>Comment</key>
<string>Whether to use use a day cycle or a fixed sky.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PhoenixInterpolateParcelWL</key>
<map>
<key>Comment</key>
@@ -1937,6 +1881,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AgentAppearanceServiceURL</key>
<map>
<key>Comment</key>
<string>Current Session Agent Appearance Service URL</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>AlertedUnsupportedHardware</key>
<map>
<key>Comment</key>
@@ -2498,6 +2453,28 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>2</integer>
</map>
<key>AvatarRotateThresholdSlow</key>
<map>
<key>Comment</key>
<string>Angle between avatar facing and camera facing at which avatar turns to face same direction as camera, when moving slowly (degrees)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>60</integer>
</map>
<key>AvatarRotateThresholdFast</key>
<map>
<key>Comment</key>
<string>Angle between avatar facing and camera facing at which avatar turns to face same direction as camera, when moving fast (degrees)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>2</integer>
</map>
<key>AvatarBakedTextureUploadTimeout</key>
<map>
<key>Comment</key>
@@ -2670,14 +2647,25 @@ This should be as low as possible, but too low may break functionality</string>
<key>BlockAvatarAppearanceMessages</key>
<map>
<key>Comment</key>
<string>Ignore's appearance messages (for simulating Ruth)</string>
<string>Ignores appearance messages (for simulating Ruth)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<integer>0</integer>
</map>
<key>BlockSomeAvatarAppearanceVisualParams</key>
<map>
<key>Comment</key>
<string>Drop around 50% of VisualParam occurances in appearance messages (for simulating Ruth)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>BrowserProxyAddress</key>
<map>
<key>Comment</key>
@@ -4559,6 +4547,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<string />
</map>
<key>DebugAvatarAppearanceMessage</key>
<map>
<key>Comment</key>
<string>Dump a bunch of XML files when handling appearance messages</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugAvatarRezTime</key>
<map>
<key>Comment</key>
@@ -4579,6 +4578,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>DebugAvatarCompositeBaked</key>
<map>
<key>Comment</key>
<string>Colorize avatar meshes based on baked/composite state.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DebugBeaconLineWidth</key>
@@ -4683,7 +4693,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>DebugShowTime</key>
<map>
<key>Comment</key>
<string>Show depth buffer contents</string>
<string>Show time info</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -8083,6 +8093,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<real>1.0</real>
</map>
<key>InventoryDebugSimulateOpFailureRate</key>
<map>
<key>Comment</key>
<string>Rate at which we simulate failures of copy/link requests in some operations</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>0.0</real>
</map>
<key>InventoryDisplayInbox</key>
<map>
<key>Comment</key>
@@ -8869,17 +8890,6 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<real>20.0</real>
</map>
<key>MapServerURL</key>
<map>
<key>Comment</key>
<string>World map URL template for locating map tiles</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://map.secondlife.com.s3.amazonaws.com/</string>
</map>
<key>UseWebMapTiles</key>
<map>
<key>Comment</key>
@@ -8913,6 +8923,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<real>128.0</real>
</map>
<key>MapServerURL</key>
<map>
<key>Comment</key>
<string>World map URL template for locating map tiles</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>http://map.secondlife.com.s3.amazonaws.com/</string>
</map>
<key>MapShowAgentCount</key>
<map>
<key>Comment</key>
@@ -10969,6 +10990,20 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderPerformanceTest</key>
<map>
<key>Comment</key>
<string>
Disable rendering of everything but in-world content for
performance testing
</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderLocalLights</key>
<map>
@@ -11395,6 +11430,18 @@ This should be as low as possible, but too low may break functionality</string>
<real>0</real>
</map>
<key>RenderDepthPrePass</key>
<map>
<key>Comment</key>
<string>EXPERIMENTAL: Prime the depth buffer with simple prim geometry before rendering with textures.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderDepthOfField</key>
<map>
<key>Comment</key>
@@ -12017,6 +12064,28 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>DisableAllRenderTypes</key>
<map>
<key>Comment</key>
<string>Disables all rendering types.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DisableAllRenderFeatures</key>
<map>
<key>Comment</key>
<string>Disables all rendering features.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderHUDInSnapshot</key>
<map>
<key>Comment</key>
@@ -12518,7 +12587,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>RenderUseVAO</key>
<map>
<key>Comment</key>
<string>Use GL Vertex Array Objects</string>
<string>[EXPERIMENTAL] Use GL Vertex Array Objects</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@@ -12526,6 +12595,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderUseTransformFeedback</key>
<map>
<key>Comment</key>
<string>[EXPERIMENTAL] Use transform feedback shaders for LoD updates</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>RenderVBOMappingDisable</key>
<map>
<key>Comment</key>
@@ -14315,6 +14395,72 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>TextureFetchUpdateHighPriority</key>
<map>
<key>Comment</key>
<string>Number of high priority textures to update per frame</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>32</integer>
</map>
<key>TextureFetchUpdateMaxMediumPriority</key>
<map>
<key>Comment</key>
<string>Maximum number of medium priority textures to update per frame</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>256</integer>
</map>
<key>TextureFetchUpdateMinMediumPriority</key>
<map>
<key>Comment</key>
<string>Minimum number of medium priority textures to update per frame</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>32</integer>
</map>
<key>TextureFetchUpdatePriorityThreshold</key>
<map>
<key>Comment</key>
<string>Threshold under which textures will be considered too low priority and skipped for update</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>0.0</integer>
</map>
<key>TextureFetchUpdateSkipLowPriority</key>
<map>
<key>Comment</key>
<string>Flag indicating if we want to skip textures with too low of a priority</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>TextureFetchUpdatePriorities</key>
<map>
<key>Comment</key>
<string>Number of priority texture to update per frame</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<integer>32</integer>
</map>
<key>TextureLoadFullRes</key>
<map>
<key>Comment</key>
@@ -14758,6 +14904,61 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>UseEnvironmentFromRegion</key>
<map>
<key>Comment</key>
<string>Choose whether to use the region's environment settings, or override them with the local settings.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>UseDayCycle</key>
<map>
<key>Comment</key>
<string>Whether to use use a day cycle or a fixed sky.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>WaterPresetName</key>
<map>
<key>Comment</key>
<string>Water preset to use. May be superseded by region settings.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Default</string>
</map>
<key>SkyPresetName</key>
<map>
<key>Comment</key>
<string>Sky preset to use. May be superseded by region settings or by a day cycle (see DayCycleName).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Default</string>
</map>
<key>DayCycleName</key>
<map>
<key>Comment</key>
<string>Day cycle to use. May be superseded by region settings.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Default</string>
</map>
<key>UseExternalBrowser</key>
<map>
<key>Comment</key>
@@ -14767,7 +14968,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<boolean>1</boolean>
</map>
<key>UseInventoryLinks</key>
<map>
@@ -14791,6 +14992,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>RenderSynchronousOcclusion</key>
<map>
<key>Comment</key>
<string>Don't let occlusion queries get more than one frame behind (block until they complete).</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SkipReflectOcclusionUpdates</key>
<map>
<key>Comment</key>
@@ -15725,6 +15937,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>-1</integer>
</map>
<key>ForcePeriodicRenderingTime</key>
<map>
<key>Comment</key>
<string>Periodically enable all rendering masks for a single frame.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>-1.0</integer>
</map>
<key>ZoomDirect</key>
<map>
<key>Comment</key>
@@ -15923,6 +16146,17 @@ This should be as low as possible, but too low may break functionality</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SimulateFBOFailure</key>
<map>
<key>Comment</key>
<string>[DEBUG] Make allocateScreenBuffer return false. Used to test error handling.</string>
<key>Persist</key>
<integer>0</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>FloaterUploadRect</key>
<map>
<key>Comment</key>