Merged 3Di code that provides scene and avatar serialization, and plugin support for region move/split/merge. See ThirdParty/3Di/README.txt. Unless the new modules are used there should be no noticeable changes when running OpenSim.

1 files changed, 43 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 860f5fb..882e589 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -57,6 +57,7 @@ namespace OpenSim.Region.Environment.Scenes
         // SceneObjects is not currently populated or used.
         //public Dictionary<LLUUID, SceneObjectGroup> SceneObjects;
         public Dictionary<LLUUID, EntityBase> Entities;
+        public Dictionary<LLUUID, ScenePresence> RestorePresences;
 
         public BasicQuadTreeNode QuadTree;
 
@@ -455,6 +456,48 @@ namespace OpenSim.Region.Environment.Scenes
             return newAvatar;
         }
 
+        public void AddScenePresence(ScenePresence presence)
+        {
+            bool child = presence.IsChildAgent;
+
+            if (child)
+            {
+                m_numChildAgents++;
+                m_log.Info("[SCENE]"+ m_regInfo.RegionName + ": Creating new child agent.");
+            }
+            else
+            {
+                m_numRootAgents++;
+                m_log.Info("[SCENE] "+ m_regInfo.RegionName + ": Creating new root agent.");
+                m_log.Info("[SCENE] "+ m_regInfo.RegionName + ": Adding Physical agent.");
+
+                presence.AddToPhysicalScene();
+            }
+
+            lock (Entities)
+            {
+                if (!Entities.ContainsKey(presence.m_uuid))
+                {
+                    Entities.Add(presence.m_uuid, presence);
+                }
+                else
+                {
+                    Entities[presence.m_uuid] = presence;
+                }
+            }
+            lock (ScenePresences)
+            {
+                if (ScenePresences.ContainsKey(presence.m_uuid))
+                {
+                    ScenePresences[presence.m_uuid] = presence;
+                }
+                else
+                {
+                    ScenePresences.Add(presence.m_uuid, presence);
+                }
+            }
+        }        
+
         public void SwapRootChildAgent(bool direction_RC_CR_T_F)
         {
             if (direction_RC_CR_T_F)