aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorRobert Adams2012-08-31 13:39:29 -0700
committerRobert Adams2012-09-07 16:05:16 -0700
commit189f51233e48026347a3443628350044e4b6fe8a (patch)
tree805f9ca9dcf94fcde33c1e93e4139d1564703c01 /OpenSim
parentBulletSim: Modify collision flag calls to return the current flags. (diff)
downloadopensim-SC_OLD-189f51233e48026347a3443628350044e4b6fe8a.zip
opensim-SC_OLD-189f51233e48026347a3443628350044e4b6fe8a.tar.gz
opensim-SC_OLD-189f51233e48026347a3443628350044e4b6fe8a.tar.bz2
opensim-SC_OLD-189f51233e48026347a3443628350044e4b6fe8a.tar.xz
BulletSim: PhysicsActorType() now returns the correct value rather than 'unknown'.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs1
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs4
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 747ae71..dc2b595 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -92,6 +92,7 @@ public class BSCharacter : BSPhysObject
92 _localID = localID; 92 _localID = localID;
93 _avName = avName; 93 _avName = avName;
94 Scene = parent_scene; 94 Scene = parent_scene;
95 _physicsActorType = (int)ActorTypes.Agent;
95 _position = pos; 96 _position = pos;
96 _size = size; 97 _size = size;
97 _flying = isFlying; 98 _flying = isFlying;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 6fcd416..de182f8 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -114,6 +114,7 @@ public sealed class BSPrim : BSPhysObject
114 // m_log.DebugFormat("{0}: BSPrim creation of {1}, id={2}", LogHeader, primName, localID); 114 // m_log.DebugFormat("{0}: BSPrim creation of {1}, id={2}", LogHeader, primName, localID);
115 _localID = localID; 115 _localID = localID;
116 _avName = primName; 116 _avName = primName;
117 _physicsActorType = (int)ActorTypes.Prim;
117 _scene = parent_scene; 118 _scene = parent_scene;
118 _position = pos; 119 _position = pos;
119 _size = size; 120 _size = size;
@@ -444,8 +445,7 @@ public sealed class BSPrim : BSPhysObject
444 } 445 }
445 public override int PhysicsActorType { 446 public override int PhysicsActorType {
446 get { return _physicsActorType; } 447 get { return _physicsActorType; }
447 set { _physicsActorType = value; 448 set { _physicsActorType = value; }
448 }
449 } 449 }
450 public override bool IsPhysical { 450 public override bool IsPhysical {
451 get { return _isPhysical; } 451 get { return _isPhysical; }