Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2012-03-07 01:05:32 +00:00
5 changed files with 25 additions and 22 deletions

View File

@@ -1691,8 +1691,6 @@ namespace OpenSim.Region.Framework.Scenes
if (userExposed)
dupe.UUID = UUID.Random();
// The PhysActor cannot be valid on a copy because the copy is not in the scene yet.
// Null it, the caller has to create a new one once the object is added to a scene
dupe.PhysActor = null;
dupe.OwnerID = AgentID;