aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorUbitUmarov2012-03-06 05:13:39 +0000
committerUbitUmarov2012-03-06 05:13:39 +0000
commitcca94aaefc36fad366e789d6d2e902dda078e3f7 (patch)
tree8bd6bb928db2ef969ed768ee3f8ede8abf3afa91 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
downloadopensim-SC_OLD-cca94aaefc36fad366e789d6d2e902dda078e3f7.zip
opensim-SC_OLD-cca94aaefc36fad366e789d6d2e902dda078e3f7.tar.gz
opensim-SC_OLD-cca94aaefc36fad366e789d6d2e902dda078e3f7.tar.bz2
opensim-SC_OLD-cca94aaefc36fad366e789d6d2e902dda078e3f7.tar.xz
make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 1c72b10..b132a19 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1727,8 +1727,6 @@ namespace OpenSim.Region.Framework.Scenes
1727 1727
1728 // Move afterwards ResetIDs as it clears the localID 1728 // Move afterwards ResetIDs as it clears the localID
1729 dupe.LocalId = localID; 1729 dupe.LocalId = localID;
1730 if(dupe.PhysActor != null)
1731 dupe.PhysActor.LocalID = localID;
1732 1730
1733 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 1731 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
1734 dupe.LastOwnerID = OwnerID; 1732 dupe.LastOwnerID = OwnerID;
@@ -1749,6 +1747,9 @@ namespace OpenSim.Region.Framework.Scenes
1749 dupe.DoPhysicsPropertyUpdate(UsePhysics, true); 1747 dupe.DoPhysicsPropertyUpdate(UsePhysics, true);
1750 } 1748 }
1751 1749
1750 if (dupe.PhysActor != null)
1751 dupe.PhysActor.LocalID = localID;
1752
1752 ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed); 1753 ParentGroup.Scene.EventManager.TriggerOnSceneObjectPartCopy(dupe, this, userExposed);
1753 1754
1754// m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID); 1755// m_log.DebugFormat("[SCENE OBJECT PART]: Clone of {0} {1} finished", Name, UUID);