diff options
| author | Justin Clark-Casey (justincc) | 2014-01-30 00:06:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-30 00:06:09 +0000 |
| commit | b50e5704b8b5b49e9a845543dcc64182aabcb9e3 (patch) | |
| tree | 7c03d7d85bdeef75a093c8a3d42a9050f07dbfb1 /bin | |
| parent | Merge branch 'justincc-master' (diff) | |
| parent | BulletSim: default physical terrain implementation to heightmap. (diff) | |
| download | opensim-SC_OLD-b50e5704b8b5b49e9a845543dcc64182aabcb9e3.zip opensim-SC_OLD-b50e5704b8b5b49e9a845543dcc64182aabcb9e3.tar.gz opensim-SC_OLD-b50e5704b8b5b49e9a845543dcc64182aabcb9e3.tar.bz2 opensim-SC_OLD-b50e5704b8b5b49e9a845543dcc64182aabcb9e3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin')
| -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. |