diff options
| author | Melanie | 2014-02-04 01:55:41 +0000 |
|---|---|---|
| committer | Melanie | 2014-02-04 01:55:41 +0000 |
| commit | e1d1c279651784d7290241b8c4b416bc4c96ab3c (patch) | |
| tree | 0a6f258ff2612b0faaf6aceadaa7be09b1f0386e /bin/OpenSimDefaults.ini | |
| parent | Dropping the rest of Avination's modified appearance code for core. (diff) | |
| parent | Add "--no-objects" parameter to 'load oar'. (diff) | |
| download | opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index df94239..026f285 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -1001,10 +1001,10 @@ | |||
| 1001 | 1001 | ||
| 1002 | ; Terrain implementation can use either Bullet's heightField or BulletSim can build | 1002 | ; Terrain implementation can use either Bullet's heightField or BulletSim can build |
| 1003 | ; a mesh. 0=heightField, 1=mesh | 1003 | ; a mesh. 0=heightField, 1=mesh |
| 1004 | TerrainImplementation = 1 | 1004 | TerrainImplementation = 0 |
| 1005 | ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield | 1005 | ; For mesh terrain, the detail of the created mesh. '1' gives 256x256 (heightfield |
| 1006 | ; resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher | 1006 | ; resolution). '2' gives 512x512. Etc. Cannot be larger than '4'. Higher |
| 1007 | ; magnification uses lots of memory. | 1007 | ; magnifications use lots of memory. |
| 1008 | TerrainMeshMagnification = 2 | 1008 | TerrainMeshMagnification = 2 |
| 1009 | 1009 | ||
| 1010 | ; Avatar physics height adjustments. | 1010 | ; Avatar physics height adjustments. |