diff options
author | Robert Adams | 2013-05-17 14:43:53 -0700 |
---|---|---|
committer | Robert Adams | 2013-05-17 21:19:38 -0700 |
commit | 214bae14799c05c12595b067ff2eb0e2e5b4eeb2 (patch) | |
tree | 0067dd4f00a9b565e916b861d452dd98f4db0d3f /OpenSim/Region | |
parent | minor: remove long commented out scene cache clearing code in EntityTransferM... (diff) | |
download | opensim-SC-214bae14799c05c12595b067ff2eb0e2e5b4eeb2.zip opensim-SC-214bae14799c05c12595b067ff2eb0e2e5b4eeb2.tar.gz opensim-SC-214bae14799c05c12595b067ff2eb0e2e5b4eeb2.tar.bz2 opensim-SC-214bae14799c05c12595b067ff2eb0e2e5b4eeb2.tar.xz |
BulletSim: fix BulletSim crashing if there is no [BulletSim] section
in any INI file. Update TODO list.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 6 | ||||
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index 3f407ce..9ed2d06 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -268,6 +268,12 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
268 | // Do any replacements in the parameters | 268 | // Do any replacements in the parameters |
269 | m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName); | 269 | m_physicsLoggingPrefix = m_physicsLoggingPrefix.Replace("%REGIONNAME%", RegionName); |
270 | } | 270 | } |
271 | else | ||
272 | { | ||
273 | BulletEngineName = "BulletUnmanaged"; | ||
274 | m_physicsLoggingEnabled = false; | ||
275 | VehicleLoggingEnabled = false; | ||
276 | } | ||
271 | 277 | ||
272 | // The material characteristics. | 278 | // The material characteristics. |
273 | BSMaterials.InitializeFromDefaults(Params); | 279 | BSMaterials.InitializeFromDefaults(Params); |
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt index 5792ae6..df1da63 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimTODO.txt | |||
@@ -1,16 +1,12 @@ | |||
1 | PROBLEMS TO LOOK INTO | 1 | CURRENT PROBLEMS TO FIX AND/OR LOOK AT |
2 | ================================================= | 2 | ================================================= |
3 | Nebadon vehicle ride, get up, ride again. Second time vehicle does not act correctly. | 3 | Script changing rotation of child prim while vehicle moving (eg turning wheel) causes |
4 | the wheel to appear to jump back. Looks like sending position from previous update. | ||
5 | Vehicle ride, get up, ride again. Second time vehicle does not act correctly. | ||
4 | Have to rez new vehicle and delete the old to fix situation. | 6 | Have to rez new vehicle and delete the old to fix situation. |
5 | Hitting RESET on Nebadon's vehicle while riding causes vehicle to get into odd | 7 | Hitting RESET on Nebadon's vehicle while riding causes vehicle to get into odd |
6 | position state where it will not settle onto ground properly, etc | 8 | position state where it will not settle onto ground properly, etc |
7 | Two of Nebadon vehicles in a sim max the CPU. This is new. | 9 | Two of Nebadon vehicles in a sim max the CPU. This is new. |
8 | A sitting, active vehicle bobs up and down a small amount. | ||
9 | |||
10 | CURRENT PRIORITIES | ||
11 | ================================================= | ||
12 | Use the HACD convex hull routine in Bullet rather than the C# version. | ||
13 | Speed up hullifying large meshes. | ||
14 | Enable vehicle border crossings (at least as poorly as ODE) | 10 | Enable vehicle border crossings (at least as poorly as ODE) |
15 | Terrain skirts | 11 | Terrain skirts |
16 | Avatar created in previous region and not new region when crossing border | 12 | Avatar created in previous region and not new region when crossing border |
@@ -361,4 +357,6 @@ Angular motion around Z moves the vehicle in world Z and not vehicle Z in ODE. | |||
361 | Nebadon vehicles turning funny in arena (DONE) | 357 | Nebadon vehicles turning funny in arena (DONE) |
362 | Lock axis (DONE 20130401) | 358 | Lock axis (DONE 20130401) |
363 | Terrain detail: double terrain mesh detail (DONE) | 359 | Terrain detail: double terrain mesh detail (DONE) |
360 | Use the HACD convex hull routine in Bullet rather than the C# version. | ||
361 | Speed up hullifying large meshes. (DONE) | ||
364 | 362 | ||