diff options
| author | Diva Canto | 2011-12-20 09:53:05 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-12-20 09:53:05 -0800 |
| commit | dd69c9fd202e7cd7a52f08ab40939348a0b86ef7 (patch) | |
| tree | ecaf1a5e5628cc4ded2d281cd47af78c9e5033f4 /OpenSim/Region/Physics | |
| parent | Fixed bug of avie going under the terrain when crossing regions in certain di... (diff) | |
| parent | Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs a... (diff) | |
| download | opensim-SC-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.zip opensim-SC-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.tar.gz opensim-SC-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.tar.bz2 opensim-SC-dd69c9fd202e7cd7a52f08ab40939348a0b86ef7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
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 | } |