aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 14ffa25..4615e7a 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -53,11 +53,11 @@ namespace OpenSim.Region.Environment.Scenes
53 53
54 #region Fields 54 #region Fields
55 55
56 internal Dictionary<LLUUID, ScenePresence> ScenePresences; 56 internal Dictionary<LLUUID, ScenePresence> ScenePresences = new Dictionary<LLUUID, ScenePresence>();
57 // SceneObjects is not currently populated or used. 57 // SceneObjects is not currently populated or used.
58 //public Dictionary<LLUUID, SceneObjectGroup> SceneObjects; 58 //public Dictionary<LLUUID, SceneObjectGroup> SceneObjects;
59 internal Dictionary<LLUUID, EntityBase> Entities; 59 internal Dictionary<LLUUID, EntityBase> Entities = new Dictionary<LLUUID, EntityBase>();
60 internal Dictionary<LLUUID, ScenePresence> RestorePresences; 60 internal Dictionary<LLUUID, ScenePresence> RestorePresences = new Dictionary<LLUUID, ScenePresence>();
61 61
62 public BasicQuadTreeNode QuadTree; 62 public BasicQuadTreeNode QuadTree;
63 63
@@ -825,6 +825,11 @@ namespace OpenSim.Region.Environment.Scenes
825 return false; 825 return false;
826 } 826 }
827 827
828 /// <summary>
829 /// Returns a list of the entities in the scene. This is a new list so operations perform on the list itself
830 /// will not affect the original list of objects in the scene.
831 /// </summary>
832 /// <returns></returns>
828 public List<EntityBase> GetEntities() 833 public List<EntityBase> GetEntities()
829 { 834 {
830 List<EntityBase> result; 835 List<EntityBase> result;
@@ -1378,7 +1383,7 @@ namespace OpenSim.Region.Environment.Scenes
1378 /// <param name="flags"></param> 1383 /// <param name="flags"></param>
1379 public void DuplicateObject(uint originalPrim, LLVector3 offset, uint flags, LLUUID AgentID, LLUUID GroupID) 1384 public void DuplicateObject(uint originalPrim, LLVector3 offset, uint flags, LLUUID AgentID, LLUUID GroupID)
1380 { 1385 {
1381 m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID); 1386 //m_log.DebugFormat("[SCENE]: Duplication of object {0} at offset {1} requested by agent {2}", originalPrim, offset, AgentID);
1382 1387
1383 List<EntityBase> EntityList = GetEntities(); 1388 List<EntityBase> EntityList = GetEntities();
1384 1389