diff options
| author | Mic Bowman | 2011-04-21 08:23:01 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-21 08:23:01 -0700 |
| commit | 371576d1dd9fb49f9e366b0fac44ab73381b3baa (patch) | |
| tree | af61ce33dc45340ea1f99066eee64950014994ee /bin/OpenSimDefaults.ini | |
| parent | Added ability to remove unacked packet from UnackedPacketCollection without a... (diff) | |
| parent | fix meshing failure on sculpt maps smaller than 64x64 (diff) | |
| download | opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.zip opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.gz opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.bz2 opensim-SC_OLD-371576d1dd9fb49f9e366b0fac44ab73381b3baa.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'bin/OpenSimDefaults.ini')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index e72e851..30ebf84 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -459,7 +459,7 @@ | |||
| 459 | [Mesh] | 459 | [Mesh] |
| 460 | ; enable / disable Collada mesh support | 460 | ; enable / disable Collada mesh support |
| 461 | ; default is true | 461 | ; default is true |
| 462 | ; ColladaMesh = true | 462 | ColladaMesh = true |
| 463 | 463 | ||
| 464 | 464 | ||
| 465 | [ODEPhysicsSettings] | 465 | [ODEPhysicsSettings] |