diff options
author | Justin Clark-Casey (justincc) | 2012-03-08 01:59:00 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-03-08 01:59:00 +0000 |
commit | 430304c176584ce79970d8a7456d593fffb0bc34 (patch) | |
tree | 329d705cc2579480bbf8068be92c895f196e66ac | |
parent | Change "help" to display categories/module list then "help <category/module>"... (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-430304c176584ce79970d8a7456d593fffb0bc34.zip opensim-SC_OLD-430304c176584ce79970d8a7456d593fffb0bc34.tar.gz opensim-SC_OLD-430304c176584ce79970d8a7456d593fffb0bc34.tar.bz2 opensim-SC_OLD-430304c176584ce79970d8a7456d593fffb0bc34.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 65905a0..439b718 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1546,10 +1546,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1546 | if (userExposed) | 1546 | if (userExposed) |
1547 | dupe.UUID = UUID.Random(); | 1547 | dupe.UUID = UUID.Random(); |
1548 | 1548 | ||
1549 | //memberwiseclone means it also clones the physics actor reference | 1549 | dupe.PhysActor = null; |
1550 | // This will make physical prim 'bounce' if not set to null. | ||
1551 | if (!userExposed) | ||
1552 | dupe.PhysActor = null; | ||
1553 | 1550 | ||
1554 | dupe.OwnerID = AgentID; | 1551 | dupe.OwnerID = AgentID; |
1555 | dupe.GroupID = GroupID; | 1552 | dupe.GroupID = GroupID; |