aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
authorMelanie2010-08-07 05:41:41 +0100
committerMelanie2010-08-07 05:41:41 +0100
commit8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7 (patch)
treea9058df2a8b7b49944a01f718946e0d076758c15 /OpenSim/Region/Framework/Scenes/SceneGraph.cs
parentCorrect display of landmark about info. Also correct region maturity rating (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.zip
opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.gz
opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.bz2
opensim-SC-8fd3f6cf7f76ca14369ce2aced4689e7e4337fc7.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index c0ec5df..5acc227 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1824,6 +1824,8 @@ namespace OpenSim.Region.Framework.Scenes
1824 /// <param name="originalPrim"></param> 1824 /// <param name="originalPrim"></param>
1825 /// <param name="offset"></param> 1825 /// <param name="offset"></param>
1826 /// <param name="flags"></param> 1826 /// <param name="flags"></param>
1827 /// <param name="AgentID"></param>
1828 /// <param name="GroupID"></param>
1827 protected internal void DuplicateObject(uint originalPrim, Vector3 offset, uint flags, UUID AgentID, UUID GroupID) 1829 protected internal void DuplicateObject(uint originalPrim, Vector3 offset, uint flags, UUID AgentID, UUID GroupID)
1828 { 1830 {
1829 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); 1831 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
@@ -1838,7 +1840,10 @@ namespace OpenSim.Region.Framework.Scenes
1838 /// <param name="originalPrim"></param> 1840 /// <param name="originalPrim"></param>
1839 /// <param name="offset"></param> 1841 /// <param name="offset"></param>
1840 /// <param name="flags"></param> 1842 /// <param name="flags"></param>
1841 protected internal SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) 1843 /// <param name="AgentID"></param>
1844 /// <param name="GroupID"></param>
1845 /// <param name="rot"></param>
1846 public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot)
1842 { 1847 {
1843 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); 1848 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
1844 SceneObjectGroup original = GetGroupByPrim(originalPrimID); 1849 SceneObjectGroup original = GetGroupByPrim(originalPrimID);