aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorMelanie2012-11-19 22:53:03 +0000
committerMelanie2012-11-19 22:53:03 +0000
commit9f2d232c71d76a7e652f7dbae05051e62ab558d7 (patch)
tree84f6d25a5f17d88984b23fe8e1c72a95f9a3b00e /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentMerge branch 'avination' into careminster (diff)
parentBulletSim: Use base class constructors for initialization of BSShape and othe... (diff)
downloadopensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.zip
opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.gz
opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.bz2
opensim-SC-9f2d232c71d76a7e652f7dbae05051e62ab558d7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index 14eb505..500c84a 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
@@ -88,9 +88,9 @@ public sealed class BSPrim : BSPhysObject
88 88
89 public BSPrim(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size, 89 public BSPrim(uint localID, String primName, BSScene parent_scene, OMV.Vector3 pos, OMV.Vector3 size,
90 OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical) 90 OMV.Quaternion rotation, PrimitiveBaseShape pbs, bool pisPhysical)
91 : base(parent_scene, localID, primName, "BSPrim")
91 { 92 {
92 // m_log.DebugFormat("{0}: BSPrim creation of {1}, id={2}", LogHeader, primName, localID); 93 // m_log.DebugFormat("{0}: BSPrim creation of {1}, id={2}", LogHeader, primName, localID);
93 base.BaseInitialize(parent_scene, localID, primName, "BSPrim");
94 _physicsActorType = (int)ActorTypes.Prim; 94 _physicsActorType = (int)ActorTypes.Prim;
95 _position = pos; 95 _position = pos;
96 _size = size; 96 _size = size;