diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index f47450f..9f38a99 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1720,6 +1720,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1720 | /// <param name="originalPrim"></param> | 1720 | /// <param name="originalPrim"></param> |
1721 | /// <param name="offset"></param> | 1721 | /// <param name="offset"></param> |
1722 | /// <param name="flags"></param> | 1722 | /// <param name="flags"></param> |
1723 | /// <param name="AgentID"></param> | ||
1724 | /// <param name="GroupID"></param> | ||
1723 | protected internal void DuplicateObject(uint originalPrim, Vector3 offset, uint flags, UUID AgentID, UUID GroupID) | 1725 | protected internal void DuplicateObject(uint originalPrim, Vector3 offset, uint flags, UUID AgentID, UUID GroupID) |
1724 | { | 1726 | { |
1725 | //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); | 1727 | //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); |
@@ -1734,7 +1736,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
1734 | /// <param name="originalPrim"></param> | 1736 | /// <param name="originalPrim"></param> |
1735 | /// <param name="offset"></param> | 1737 | /// <param name="offset"></param> |
1736 | /// <param name="flags"></param> | 1738 | /// <param name="flags"></param> |
1737 | protected internal SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) | 1739 | /// <param name="AgentID"></param> |
1740 | /// <param name="GroupID"></param> | ||
1741 | /// <param name="rot"></param> | ||
1742 | public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) | ||
1738 | { | 1743 | { |
1739 | //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); | 1744 | //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); |
1740 | SceneObjectGroup original = GetGroupByPrim(originalPrimID); | 1745 | SceneObjectGroup original = GetGroupByPrim(originalPrimID); |