diff options
author | Diva Canto | 2010-08-06 17:43:41 -0700 |
---|---|---|
committer | Diva Canto | 2010-08-06 17:43:41 -0700 |
commit | 5e93a83ecda537ff8f1d2778d4016a6e52ca0ae8 (patch) | |
tree | 0c30a131daca6adcfe7d34db63df5487205ddcac /OpenSim/Region/Framework/Scenes/SceneGraph.cs | |
parent | Added Check4096 config var under [GridService], at the request of many. Chang... (diff) | |
parent | Add new SceneGraphTests class. Add simple TestDuplicateObject() (diff) | |
download | opensim-SC-5e93a83ecda537ff8f1d2778d4016a6e52ca0ae8.zip opensim-SC-5e93a83ecda537ff8f1d2778d4016a6e52ca0ae8.tar.gz opensim-SC-5e93a83ecda537ff8f1d2778d4016a6e52ca0ae8.tar.bz2 opensim-SC-5e93a83ecda537ff8f1d2778d4016a6e52ca0ae8.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 03549d7..9f38a99 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1739 | /// <param name="AgentID"></param> | 1739 | /// <param name="AgentID"></param> |
1740 | /// <param name="GroupID"></param> | 1740 | /// <param name="GroupID"></param> |
1741 | /// <param name="rot"></param> | 1741 | /// <param name="rot"></param> |
1742 | protected internal SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) | 1742 | public SceneObjectGroup DuplicateObject(uint originalPrimID, Vector3 offset, uint flags, UUID AgentID, UUID GroupID, Quaternion rot) |
1743 | { | 1743 | { |
1744 | //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); |
1745 | SceneObjectGroup original = GetGroupByPrim(originalPrimID); | 1745 | SceneObjectGroup original = GetGroupByPrim(originalPrimID); |