aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2012-10-22 16:33:21 -0700
committerRobert Adams2012-10-22 22:24:59 -0700
commit14eeb8b31b865f7b1927703028b03b6f61693cb6 (patch)
tree3139a56a535d1919a8cb4b6d93a66e3100866c51 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentBulletSim: fix problem of not rebuilding shape by clearing last rebuild faile... (diff)
downloadopensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.zip
opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.gz
opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.bz2
opensim-SC_OLD-14eeb8b31b865f7b1927703028b03b6f61693cb6.tar.xz
BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 3c5e6e5..8401c69 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -399,7 +399,7 @@ public sealed class BSPrim : BSPhysObject
399 { 399 {
400 // Done at taint time so we're sure the physics engine is not using the variables 400 // Done at taint time so we're sure the physics engine is not using the variables
401 // Vehicle code changes the parameters for this vehicle type. 401 // Vehicle code changes the parameters for this vehicle type.
402 this._vehicle.ProcessTypeChange(type); 402 _vehicle.ProcessTypeChange(type);
403 }); 403 });
404 } 404 }
405 } 405 }
@@ -1246,12 +1246,13 @@ public sealed class BSPrim : BSPhysObject
1246 FillShapeInfo(out shapeData); 1246 FillShapeInfo(out shapeData);
1247 1247
1248 // If this prim is part of a linkset, we must remove and restore the physical 1248 // If this prim is part of a linkset, we must remove and restore the physical
1249 // links of the body is rebuilt. 1249 // links if the body is rebuilt.
1250 bool needToRestoreLinkset = false; 1250 bool needToRestoreLinkset = false;
1251 1251
1252 // Create the correct physical representation for this type of object. 1252 // Create the correct physical representation for this type of object.
1253 // Updates BSBody and BSShape with the new information. 1253 // Updates BSBody and BSShape with the new information.
1254 // Ignore 'forceRebuild'. This routine makes the right choices and changes of necessary. 1254 // Ignore 'forceRebuild'. This routine makes the right choices and changes of necessary.
1255 // Returns 'true' if either the body or the shape was changed.
1255 PhysicsScene.Shapes.GetBodyAndShape(false, PhysicsScene.World, this, shapeData, BaseShape, 1256 PhysicsScene.Shapes.GetBodyAndShape(false, PhysicsScene.World, this, shapeData, BaseShape,
1256 null, delegate(BulletBody dBody) 1257 null, delegate(BulletBody dBody)
1257 { 1258 {
@@ -1355,7 +1356,7 @@ public sealed class BSPrim : BSPhysObject
1355 DetailLog("{0},BSPrim.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}", 1356 DetailLog("{0},BSPrim.UpdateProperties,call,pos={1},orient={2},vel={3},accel={4},rotVel={5}",
1356 LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity); 1357 LocalID, _position, _orientation, _velocity, _acceleration, _rotationalVelocity);
1357 1358
1358 // BulletSimAPI.DumpRigidBody2(Scene.World.Ptr, BSBody.Ptr); 1359 BulletSimAPI.DumpRigidBody2(PhysicsScene.World.ptr, BSBody.ptr); // DEBUG DEBUG DEBUG
1359 1360
1360 base.RequestPhysicsterseUpdate(); 1361 base.RequestPhysicsterseUpdate();
1361 } 1362 }
@@ -1368,8 +1369,8 @@ public sealed class BSPrim : BSPhysObject
1368 entprop.Acceleration, entprop.RotationalVelocity); 1369 entprop.Acceleration, entprop.RotationalVelocity);
1369 } 1370 }
1370 */ 1371 */
1371 // The linkset implimentation might want to know about this.
1372 1372
1373 // The linkset implimentation might want to know about this.
1373 Linkset.UpdateProperties(this); 1374 Linkset.UpdateProperties(this);
1374 } 1375 }
1375} 1376}