aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorDiva Canto2011-12-20 09:53:05 -0800
committerDiva Canto2011-12-20 09:53:05 -0800
commitdd69c9fd202e7cd7a52f08ab40939348a0b86ef7 (patch)
treeecaf1a5e5628cc4ded2d281cd47af78c9e5033f4 /OpenSim/Region/Physics
parentFixed bug of avie going under the terrain when crossing regions in certain di... (diff)
parentMove HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a... (diff)
downloadopensim-SC_OLD-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.zip
opensim-SC_OLD-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.tar.gz
opensim-SC_OLD-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.tar.bz2
opensim-SC_OLD-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
index d8aad7b..04ba738 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs
@@ -1780,7 +1780,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1780 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, 1780 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1781 Vector3 size, Quaternion rotation, bool isPhysical, uint localid) 1781 Vector3 size, Quaternion rotation, bool isPhysical, uint localid)
1782 { 1782 {
1783 m_log.DebugFormat("[ODE SCENE]: Adding physics prim {0} {1} to physics scene {2}", primName, localid, Name); 1783// m_log.DebugFormat("[ODE SCENE]: Adding physics prim {0} {1} to physics scene {2}", primName, localid, Name);
1784 1784
1785 return AddPrim(primName, position, size, rotation, pbs, isPhysical, localid); 1785 return AddPrim(primName, position, size, rotation, pbs, isPhysical, localid);
1786 } 1786 }