diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2013-11-11 14:50:52 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2013-11-11 14:50:52 -0700 |
| commit | 1983f52ce5211c02a55f5cabd86962eea3a22084 (patch) | |
| tree | 7bf52ee5cfde218d36eeebd6188432cb4655b009 /indra/newview/app_settings/settings.xml | |
| parent | 7956b9e3e83ed4a5d648e63ae7c06a90313a6b09 (diff) | |
| parent | 83c2098fb99c4a4d33dfa5f4a71ab64ca39b547f (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 66 |
1 files changed, 44 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 14384edc1f..adcea5103e 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -742,17 +742,6 @@ <key>Value</key> <integer>40</integer> </map> - <key>BackSphereCullingRadius</key> - <map> - <key>Comment</key> - <string>Radius of back sphere in meters, objects behind camera but within this radius are loaded for rendering</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>100.0</real> - </map> <key>BottomPanelNew</key> <map> <key>Comment</key> @@ -7112,17 +7101,6 @@ <real>0.75</real> </array> </map> - <key>ObjectProjectionAreaCutOff</key> - <map> - <key>Comment</key> - <string>Threshold in number of pixels of the projection area in screen of object bounding sphere. Objects smaller than this threshold are not rendered.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>100.0</real> - </map> <key>ParcelMediaAutoPlayEnable</key> <map> <key>Comment</key> @@ -10231,6 +10209,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SceneLoadFrontPixelThreshold</key> + <map> + <key>Comment</key> + <string>in pixels, all objects in view frustum whose screen area is greater than this threshold will be loaded</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>100.0</real> + </map> <key>SceneLoadingMonitorEnabled</key> <map> <key>Comment</key> @@ -10264,6 +10253,39 @@ <key>Value</key> <real>0.02</real> </map> + <key>SceneLoadMinRadius</key> + <map> + <key>Comment</key> + <string>in meters, all objects (visible or invisible) within this radius will remain loaded in memory</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>16.0</real> + </map> + <key>SceneLoadRearMaxRadiusFraction</key> + <map> + <key>Comment</key> + <string>a percentage of draw distance beyond which all objects outside of view frustum will be unloaded, regardless of pixel threshold</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>20.0</real> + </map> + <key>SceneLoadRearPixelThreshold</key> + <map> + <key>Comment</key> + <string>in pixels, all objects out of view frustum whose screen area is greater than this threshold will remain loaded</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>200.0</real> + </map> <key>ScriptHelpFollowsCursor</key> <map> <key>Comment</key> |