aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneGraph.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneGraph.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 7eebb99..92fe2ab 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -82,7 +82,6 @@ namespace OpenSim.Region.Framework.Scenes
82 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>(); 82 protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
83 83
84 protected internal EntityManager Entities = new EntityManager(); 84 protected internal EntityManager Entities = new EntityManager();
85 protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>();
86 85
87 protected RegionInfo m_regInfo; 86 protected RegionInfo m_regInfo;
88 protected Scene m_parentScene; 87 protected Scene m_parentScene;
@@ -629,8 +628,8 @@ namespace OpenSim.Region.Framework.Scenes
629 { 628 {
630 ScenePresence newAvatar = null; 629 ScenePresence newAvatar = null;
631 630
631 // ScenePresence always defaults to child agent
632 newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance); 632 newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance);
633 newAvatar.IsChildAgent = true;
634 633
635 AddScenePresence(newAvatar); 634 AddScenePresence(newAvatar);
636 635
@@ -643,6 +642,7 @@ namespace OpenSim.Region.Framework.Scenes
643 /// <param name="presence"></param> 642 /// <param name="presence"></param>
644 protected internal void AddScenePresence(ScenePresence presence) 643 protected internal void AddScenePresence(ScenePresence presence)
645 { 644 {
645 // Always a child when added to the scene
646 bool child = presence.IsChildAgent; 646 bool child = presence.IsChildAgent;
647 647
648 if (child) 648 if (child)