aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-03-07 01:05:32 +0000
committerMelanie2012-03-07 01:05:32 +0000
commitf8b1b86c3ad4602a246a7642035e5bef4004a930 (patch)
tree0c33449e198e3411636a29e989ab1292b69f0d93 /OpenSim/Region
parentFix merge issue (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.zip
opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.tar.gz
opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.tar.bz2
opensim-SC_OLD-f8b1b86c3ad4602a246a7642035e5bef4004a930.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 9c06786..0760808 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1691,8 +1691,6 @@ namespace OpenSim.Region.Framework.Scenes
1691 if (userExposed) 1691 if (userExposed)
1692 dupe.UUID = UUID.Random(); 1692 dupe.UUID = UUID.Random();
1693 1693
1694 // The PhysActor cannot be valid on a copy because the copy is not in the scene yet.
1695 // Null it, the caller has to create a new one once the object is added to a scene
1696 dupe.PhysActor = null; 1694 dupe.PhysActor = null;
1697 1695
1698 dupe.OwnerID = AgentID; 1696 dupe.OwnerID = AgentID;