From a9e76ce8470062f7e9a1de3a314fd37e675e25a9 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 3 Feb 2009 17:50:25 +0000 Subject: * minor: remove some pointless assignments in SOG.Copy() that had already been done by MemberwiseClone() --- OpenSim/Region/Environment/Scenes/SceneGraph.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs') diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs index 940aee6..24eaad1 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs @@ -1496,8 +1496,11 @@ namespace OpenSim.Region.Environment.Scenes // occur on link to invoke this elsewhere (such as object selection) parenPrim.RootPart.AddFlag(PrimFlags.CreateSelected); parenPrim.TriggerScriptChangedEvent(Changed.LINK); + if (client != null) + { parenPrim.GetProperties(client); + } else { foreach (ScenePresence p in GetScenePresences()) @@ -1715,6 +1718,7 @@ namespace OpenSim.Region.Environment.Scenes // SceneObjectGroup dupe = DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Zero); DuplicateObject(originalPrim, offset, flags, AgentID, GroupID, Quaternion.Identity); } + /// /// Duplicate the given object. /// @@ -1780,6 +1784,7 @@ namespace OpenSim.Region.Environment.Scenes { m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID); } + return null; } -- cgit v1.1