aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-20 23:34:34 +0100
committerJustin Clark-Casey (justincc)2011-05-20 23:34:34 +0100
commit91a9f30b1613fba8c3ff31de5b9390b0e636ad65 (patch)
treeb48c64a1dbfd7771adf92b44eaa4eb657e1966ac
parentadd test for rezzing an object from a prim item (diff)
downloadopensim-SC_OLD-91a9f30b1613fba8c3ff31de5b9390b0e636ad65.zip
opensim-SC_OLD-91a9f30b1613fba8c3ff31de5b9390b0e636ad65.tar.gz
opensim-SC_OLD-91a9f30b1613fba8c3ff31de5b9390b0e636ad65.tar.bz2
opensim-SC_OLD-91a9f30b1613fba8c3ff31de5b9390b0e636ad65.tar.xz
implement Scene.GetSceneObjectGroup(UUID fullID) using existing index
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs16
2 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 0722cee..f718331 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4279,6 +4279,16 @@ namespace OpenSim.Region.Framework.Scenes
4279 // } 4279 // }
4280 4280
4281 /// <summary> 4281 /// <summary>
4282 /// Get a group via its UUID
4283 /// </summary>
4284 /// <param name="fullID"></param>
4285 /// <returns></returns>
4286 public SceneObjectGroup GetSceneObjectGroup(UUID fullID)
4287 {
4288 return m_sceneGraph.GetSceneObjectGroup(fullID);
4289 }
4290
4291 /// <summary>
4282 /// Get a named prim contained in this scene (will return the first 4292 /// Get a named prim contained in this scene (will return the first
4283 /// found, if there are more than one prim with the same name) 4293 /// found, if there are more than one prim with the same name)
4284 /// </summary> 4294 /// </summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 14b587f..2d547f7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -976,6 +976,22 @@ namespace OpenSim.Region.Framework.Scenes
976 } 976 }
977 977
978 /// <summary> 978 /// <summary>
979 /// Get a group in the scene
980 /// </summary>
981 /// <param name="fullID">UUID of the group</param>
982 /// <returns>null if no such group was found</returns>
983 protected internal SceneObjectGroup GetSceneObjectGroup(UUID fullID)
984 {
985 lock (SceneObjectGroupsByFullID)
986 {
987 if (SceneObjectGroupsByFullID.ContainsKey(fullID))
988 return SceneObjectGroupsByFullID[fullID];
989 }
990
991 return null;
992 }
993
994 /// <summary>
979 /// Get a part contained in this scene. 995 /// Get a part contained in this scene.
980 /// </summary> 996 /// </summary>
981 /// <param name="localID"></param> 997 /// <param name="localID"></param>