aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDan Lake2012-01-19 02:53:21 -0800
committerDan Lake2012-01-19 03:01:37 -0800
commit2c6272d11a916953bee28ed4b36d839e8c8dd4a2 (patch)
tree364794a523b077f5c1b57815a435b3a8a96528ff
parentFixed bugs in earlier commit on custom user parameters in Regions.ini (diff)
downloadopensim-SC-2c6272d11a916953bee28ed4b36d839e8c8dd4a2.zip
opensim-SC-2c6272d11a916953bee28ed4b36d839e8c8dd4a2.tar.gz
opensim-SC-2c6272d11a916953bee28ed4b36d839e8c8dd4a2.tar.bz2
opensim-SC-2c6272d11a916953bee28ed4b36d839e8c8dd4a2.tar.xz
Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
2 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 027ec96..3d8c714 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4294,6 +4294,16 @@ namespace OpenSim.Region.Framework.Scenes
4294 public SceneObjectGroup GetGroupByPrim(uint localID) 4294 public SceneObjectGroup GetGroupByPrim(uint localID)
4295 { 4295 {
4296 return m_sceneGraph.GetGroupByPrim(localID); 4296 return m_sceneGraph.GetGroupByPrim(localID);
4297 }
4298
4299 /// <summary>
4300 /// Get a scene object group that contains the prim with the given uuid
4301 /// </summary>
4302 /// <param name="fullID"></param>
4303 /// <returns>null if no scene object group containing that prim is found</returns>
4304 public SceneObjectGroup GetGroupByPrim(UUID fullID)
4305 {
4306 return m_sceneGraph.GetGroupByPrim(fullID);
4297 } 4307 }
4298 4308
4299 public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp) 4309 public override bool TryGetScenePresence(UUID agentID, out ScenePresence sp)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 1e2901b..f481e72 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -311,6 +311,7 @@ namespace OpenSim.Region.Framework.Scenes
311 /// </summary> 311 /// </summary>
312 /// 312 ///
313 /// This method does not send updates to the client - callers need to handle this themselves. 313 /// This method does not send updates to the client - callers need to handle this themselves.
314 /// Caller should also trigger EventManager.TriggerObjectAddedToScene
314 /// <param name="sceneObject"></param> 315 /// <param name="sceneObject"></param>
315 /// <param name="attachToBackup"></param> 316 /// <param name="attachToBackup"></param>
316 /// <param name="pos">Position of the object. If null then the position stored in the object is used.</param> 317 /// <param name="pos">Position of the object. If null then the position stored in the object is used.</param>
@@ -925,7 +926,7 @@ namespace OpenSim.Region.Framework.Scenes
925 /// </summary> 926 /// </summary>
926 /// <param name="fullID"></param> 927 /// <param name="fullID"></param>
927 /// <returns>null if no scene object group containing that prim is found</returns> 928 /// <returns>null if no scene object group containing that prim is found</returns>
928 private SceneObjectGroup GetGroupByPrim(UUID fullID) 929 public SceneObjectGroup GetGroupByPrim(UUID fullID)
929 { 930 {
930 SceneObjectGroup sog; 931 SceneObjectGroup sog;
931 lock (SceneObjectGroupsByFullPartID) 932 lock (SceneObjectGroupsByFullPartID)