diff options
author | Robert Adams | 2014-01-19 07:33:56 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-19 07:33:56 -0800 |
commit | 54a4b9eab4009711f574fe744e2dd82373c971c9 (patch) | |
tree | a5b587fd456bd1c5c50629f0f85ecf83bef0154d /bin | |
parent | Add J2K decoder routine that converts directly to an image. (diff) | |
download | opensim-SC-54a4b9eab4009711f574fe744e2dd82373c971c9.zip opensim-SC-54a4b9eab4009711f574fe744e2dd82373c971c9.tar.gz opensim-SC-54a4b9eab4009711f574fe744e2dd82373c971c9.tar.bz2 opensim-SC-54a4b9eab4009711f574fe744e2dd82373c971c9.tar.xz |
varregion: Update Warp3D to properly handle varregions.
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.ini.example | 12 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 9 |
2 files changed, 21 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 28c16cf..d422c33 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -308,6 +308,18 @@ | |||
308 | ;; got a large number of objects, so you can turn it off here if you'd like. | 308 | ;; got a large number of objects, so you can turn it off here if you'd like. |
309 | ; DrawPrimOnMapTile = true | 309 | ; DrawPrimOnMapTile = true |
310 | 310 | ||
311 | ;# {TexturePrims} {} {Texture prims on map tiles?} {true false} true | ||
312 | ;; Texture the faces of the prims that are rendered on the map tiles. | ||
313 | ; TexturePrims = true | ||
314 | |||
315 | ;# {TexturePrimSize} {} {Size of prims to texture faces?} {} 48 | ||
316 | ;; Only texture prims that have a diagonal size greater than this number | ||
317 | ; TexturePrimSize = 48 | ||
318 | |||
319 | ;# {RenderMeshes} {} {Render meshes and sculpties on map tiles?} {true false} false | ||
320 | ;; Attempt to render meshes and sculpties on the map | ||
321 | ; RenderMeshes = false; | ||
322 | |||
311 | 323 | ||
312 | [Permissions] | 324 | [Permissions] |
313 | ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule | 325 | ;# {permissionmodules} {} {Permission modules to use (may specify multiple modules, separated by comma} {} DefaultPermissionsModule |
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index ae7b794..d80f5ba 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -310,6 +310,15 @@ | |||
310 | ; Use terrain texture for maptiles if true, use shaded green if false | 310 | ; Use terrain texture for maptiles if true, use shaded green if false |
311 | TextureOnMapTile = true | 311 | TextureOnMapTile = true |
312 | 312 | ||
313 | ; Texture prims | ||
314 | TexturePrims = true | ||
315 | |||
316 | ; Only texture prims that have a diagonal size greater than this number | ||
317 | TexturePrimSize = 48 | ||
318 | |||
319 | ; Attempt to render meshes and sculpties on the map | ||
320 | RenderMeshes = false; | ||
321 | |||
313 | [Permissions] | 322 | [Permissions] |
314 | ; ## | 323 | ; ## |
315 | ; ## PERMISSIONS | 324 | ; ## PERMISSIONS |