aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-10 18:10:00 +0000
committerJustin Clarke Casey2008-11-10 18:10:00 +0000
commit5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4 (patch)
tree8bf214cd45c9a94aae3d6ef8d76169f19006ae41 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentthis changeset adds an option to RemoteAdmin to limit the number of (diff)
downloadopensim-SC-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.zip
opensim-SC-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.gz
opensim-SC-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.bz2
opensim-SC-5d1d5a22a9590cf8a3475a0bf13a4613b6273bf4.tar.xz
* Extend basic scene test to retrieve the object from the scene and match uuids
* Decouple sog and sop by removing the need to pass the sog to the sop when it is created - most of the code was doing this operation (and hence duplicating it) anyway * Remove unused constructors
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index aca82c3..508ddd4 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -784,10 +784,11 @@ namespace OpenSim.Region.Environment.Scenes
784 /// <returns>null if no scene object group containing that prim is found</returns> 784 /// <returns>null if no scene object group containing that prim is found</returns>
785 private SceneObjectGroup GetGroupByPrim(uint localID) 785 private SceneObjectGroup GetGroupByPrim(uint localID)
786 { 786 {
787 //m_log.DebugFormat("Entered GetGroupByPrim with localID {0}", localID);
787 List<EntityBase> EntityList = GetEntities(); 788 List<EntityBase> EntityList = GetEntities();
788
789 foreach (EntityBase ent in EntityList) 789 foreach (EntityBase ent in EntityList)
790 { 790 {
791 //m_log.DebugFormat("Looking at entity {0}", ent.UUID);
791 if (ent is SceneObjectGroup) 792 if (ent is SceneObjectGroup)
792 { 793 {
793 if (((SceneObjectGroup)ent).HasChildPrim(localID)) 794 if (((SceneObjectGroup)ent).HasChildPrim(localID))
@@ -891,6 +892,7 @@ namespace OpenSim.Region.Environment.Scenes
891 protected internal SceneObjectPart GetSceneObjectPart(UUID fullID) 892 protected internal SceneObjectPart GetSceneObjectPart(UUID fullID)
892 { 893 {
893 SceneObjectGroup group = GetGroupByPrim(fullID); 894 SceneObjectGroup group = GetGroupByPrim(fullID);
895
894 if (group != null) 896 if (group != null)
895 return group.GetChildPart(fullID); 897 return group.GetChildPart(fullID);
896 else 898 else