aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorAdam Frisby2009-04-09 10:07:40 +0000
committerAdam Frisby2009-04-09 10:07:40 +0000
commit1b56fff7c8ca3a3e14e576ecb0137d9d34997205 (patch)
tree760ceb7dc7918c287293fb7db2b7df12e6085fd9 /OpenSim/Region/Framework
parent* Thank you, mpallari for a patch that updates NHibernate inventory base mapp... (diff)
downloadopensim-SC_OLD-1b56fff7c8ca3a3e14e576ecb0137d9d34997205.zip
opensim-SC_OLD-1b56fff7c8ca3a3e14e576ecb0137d9d34997205.tar.gz
opensim-SC_OLD-1b56fff7c8ca3a3e14e576ecb0137d9d34997205.tar.bz2
opensim-SC_OLD-1b56fff7c8ca3a3e14e576ecb0137d9d34997205.tar.xz
* Implements retrieving child primitives via World.Objects[id] (MRM)
* Optimizes SceneGraph - fetches on primitives via "GetGroupByPrim" wont search the entire list if the primitive is infact the root. (Core) * Updates Test MRM.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index d6aca31..c2f9fd2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -860,6 +860,9 @@ namespace OpenSim.Region.Framework.Scenes
860 /// <returns>null if no scene object group containing that prim is found</returns> 860 /// <returns>null if no scene object group containing that prim is found</returns>
861 private SceneObjectGroup GetGroupByPrim(uint localID) 861 private SceneObjectGroup GetGroupByPrim(uint localID)
862 { 862 {
863 if (Entities.ContainsKey(localID))
864 return Entities[localID] as SceneObjectGroup;
865
863 //m_log.DebugFormat("Entered GetGroupByPrim with localID {0}", localID); 866 //m_log.DebugFormat("Entered GetGroupByPrim with localID {0}", localID);
864 List<EntityBase> EntityList = GetEntities(); 867 List<EntityBase> EntityList = GetEntities();
865 foreach (EntityBase ent in EntityList) 868 foreach (EntityBase ent in EntityList)