aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMelanie2011-06-20 03:11:34 +0100
committerMelanie2011-06-20 03:11:34 +0100
commit6ae73aea496684cf3e72264c805216fcc7de66da (patch)
treeff42233fc49c9772aa945e062422645c8186ab7d /OpenSim/Region/Framework
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.zip
opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.gz
opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.bz2
opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 43dd835..e3744bd 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1643,7 +1643,6 @@ namespace OpenSim.Region.Framework.Scenes
1643 { 1643 {
1644 PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info 1644 PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info
1645 PhysActor.SOPDescription = this.Description; 1645 PhysActor.SOPDescription = this.Description;
1646 PhysActor.LocalID = LocalId;
1647 DoPhysicsPropertyUpdate(RigidBody, true); 1646 DoPhysicsPropertyUpdate(RigidBody, true);
1648 PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0); 1647 PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
1649 } 1648 }
@@ -4435,6 +4434,7 @@ namespace OpenSim.Region.Framework.Scenes
4435 { 4434 {
4436 // It's not phantom anymore. So make sure the physics engine get's knowledge of it 4435 // It's not phantom anymore. So make sure the physics engine get's knowledge of it
4437 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape( 4436 PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
4437 LocalId,
4438 string.Format("{0}/{1}", Name, UUID), 4438 string.Format("{0}/{1}", Name, UUID),
4439 Shape, 4439 Shape,
4440 AbsolutePosition, 4440 AbsolutePosition,
@@ -4446,7 +4446,6 @@ namespace OpenSim.Region.Framework.Scenes
4446 pa = PhysActor; 4446 pa = PhysActor;
4447 if (pa != null) 4447 if (pa != null)
4448 { 4448 {
4449 pa.LocalID = LocalId;
4450 DoPhysicsPropertyUpdate(UsePhysics, true); 4449 DoPhysicsPropertyUpdate(UsePhysics, true);
4451 if (m_parentGroup != null) 4450 if (m_parentGroup != null)
4452 { 4451 {