aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-14 23:21:51 +0100
committerJustin Clark-Casey (justincc)2013-08-14 23:21:51 +0100
commit73e3ca670d7369d02f2cab71ec734b47ec50c428 (patch)
tree3d0d24ec0d2de6f011392615855939547a9e07bc /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentminor: remove unused entity transfer config in teleport v2 attachments test (diff)
parentBulletSim: include check for volume detect in check for zeroing avatar motion. (diff)
downloadopensim-SC-73e3ca670d7369d02f2cab71ec734b47ec50c428.zip
opensim-SC-73e3ca670d7369d02f2cab71ec734b47ec50c428.tar.gz
opensim-SC-73e3ca670d7369d02f2cab71ec734b47ec50c428.tar.bz2
opensim-SC-73e3ca670d7369d02f2cab71ec734b47ec50c428.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 6b5dea3..d5b999d 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -110,6 +110,8 @@ public class BSPrim : BSPhysObject
110 CreateGeomAndObject(true); 110 CreateGeomAndObject(true);
111 111
112 CurrentCollisionFlags = PhysScene.PE.GetCollisionFlags(PhysBody); 112 CurrentCollisionFlags = PhysScene.PE.GetCollisionFlags(PhysBody);
113
114 IsInitialized = true;
113 }); 115 });
114 } 116 }
115 117
@@ -117,6 +119,8 @@ public class BSPrim : BSPhysObject
117 public override void Destroy() 119 public override void Destroy()
118 { 120 {
119 // m_log.DebugFormat("{0}: Destroy, id={1}", LogHeader, LocalID); 121 // m_log.DebugFormat("{0}: Destroy, id={1}", LogHeader, LocalID);
122 IsInitialized = false;
123
120 base.Destroy(); 124 base.Destroy();
121 125
122 // Undo any vehicle properties 126 // Undo any vehicle properties