Merge branch 'master' of /home/opensim/src/OpenSim/Core

5 files changed, 51 insertions, 82 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
index 585eb00..576b645 100644
--- a/OpenSim/Region/Framework/Interfaces/ILandObject.cs
+++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs
@@ -43,7 +43,21 @@ namespace OpenSim.Region.Framework.Interfaces
         LandData LandData { get; set; }
         bool[,] LandBitmap { get; set; }
         UUID RegionUUID { get; }
+        
+        /// <summary>
+        /// The start point for the land object.  This is the western-most point as one scans land working from 
+        /// north to south.
+        /// </summary>
+        Vector3 StartPoint { get; }
+        
+        /// <summary>
+        /// The end point for the land object.  This is the eastern-most point as one scans land working from 
+        /// south to north.
+        /// </summary>        
+        Vector3 EndPoint { get; }
+        
         bool ContainsPoint(int x, int y);
+        
         ILandObject Copy();
 
         void SendLandUpdateToAvatarsOverMe();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 12fd813..dc08b49 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -498,12 +498,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGraph.Entities; }
         }
 
-        public Dictionary<UUID, ScenePresence> m_restorePresences
-        {
-            get { return m_sceneGraph.RestorePresences; }
-            set { m_sceneGraph.RestorePresences = value; }
-        }
-
         #endregion Properties
 
         #region Constructors
@@ -2483,56 +2477,26 @@ namespace OpenSim.Region.Framework.Scenes
                        (aCircuit.teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0;
 
             CheckHeartbeat();
-            ScenePresence presence;
 
-            if (m_restorePresences.ContainsKey(client.AgentId))
+            if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here
             {
-                m_log.DebugFormat("[SCENE]: Restoring agent {0} {1} in {2}", client.Name, client.AgentId, RegionInfo.RegionName);
+                m_log.Debug("[SCENE]: Adding new agent " + client.Name + " to scene " + RegionInfo.RegionName);
 
                 m_clientManager.Add(client);
                 SubscribeToClientEvents(client);
 
-                presence = m_restorePresences[client.AgentId];
-                m_restorePresences.Remove(client.AgentId);
-
-                // This is one of two paths to create avatars that are
-                // used.  This tends to get called more in standalone
-                // than grid, not really sure why, but as such needs
-                // an explicity appearance lookup here.
-                AvatarAppearance appearance = null;
-                GetAvatarAppearance(client, out appearance);
-                presence.Appearance = appearance;
+                ScenePresence sp = m_sceneGraph.CreateAndAddChildScenePresence(client, aCircuit.Appearance);
+                m_eventManager.TriggerOnNewPresence(sp);
 
-                presence.initializeScenePresence(client, RegionInfo, this);
+                sp.TeleportFlags = (TeleportFlags)aCircuit.teleportFlags;
 
-                m_sceneGraph.AddScenePresence(presence);
-
-                lock (m_restorePresences)
+                // HERE!!! Do the initial attachments right here
+                // first agent upon login is a root agent by design.
+                // All other AddNewClient calls find aCircuit.child to be true
+                if (aCircuit.child == false)
                 {
-                    Monitor.PulseAll(m_restorePresences);
-                }
-            }
-            else
-            {
-                if (GetScenePresence(client.AgentId) == null) // ensure there is no SP here
-                {
-                    m_log.Debug("[SCENE]: Adding new agent " + client.Name + " to scene " + RegionInfo.RegionName);
-
-                    m_clientManager.Add(client);
-                    SubscribeToClientEvents(client);
-
-                    ScenePresence sp = CreateAndAddScenePresence(client);
-                    if (aCircuit != null)
-                        sp.Appearance = aCircuit.Appearance;
-
-                    // HERE!!! Do the initial attachments right here
-                    // first agent upon login is a root agent by design.
-                    // All other AddNewClient calls find aCircuit.child to be true
-                    if (aCircuit == null || (aCircuit != null && aCircuit.child == false))
-                    {
-                        sp.IsChildAgent = false;
-                        Util.FireAndForget(delegate(object o) { sp.RezAttachments(); });
-                    }
+                    sp.IsChildAgent = false;
+                    Util.FireAndForget(delegate(object o) { sp.RezAttachments(); });
                 }
             }
 
@@ -2997,25 +2961,6 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Create a child agent scene presence and add it to this scene.
-        /// </summary>
-        /// <param name="client"></param>
-        /// <returns></returns>
-        protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client)
-        {
-            CheckHeartbeat();
-            AvatarAppearance appearance = null;
-            GetAvatarAppearance(client, out appearance);
-
-            ScenePresence avatar = m_sceneGraph.CreateAndAddChildScenePresence(client, appearance);
-            //avatar.KnownRegions = GetChildrenSeeds(avatar.UUID);
-
-            m_eventManager.TriggerOnNewPresence(avatar);
-
-            return avatar;
-        }
-
-        /// <summary>
         /// Get the avatar apperance for the given client.
         /// </summary>
         /// <param name="client"></param>
@@ -3324,6 +3269,10 @@ namespace OpenSim.Region.Framework.Scenes
             }
             else
             {
+                // Let the SP know how we got here. This has a lot of interesting
+                // uses down the line.
+                sp.TeleportFlags = (TeleportFlags)teleportFlags;
+
                 if (sp.IsChildAgent)
                 {
                     m_log.DebugFormat(
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a2ed54f..969ff13 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -73,7 +73,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected List<ScenePresence> m_scenePresenceArray = new List<ScenePresence>();
 
         protected internal EntityManager Entities = new EntityManager();
-        protected internal Dictionary<UUID, ScenePresence> RestorePresences = new Dictionary<UUID, ScenePresence>();
 
         protected RegionInfo m_regInfo;
         protected Scene m_parentScene;
@@ -564,8 +563,8 @@ namespace OpenSim.Region.Framework.Scenes
         {
             ScenePresence newAvatar = null;
 
+            // ScenePresence always defaults to child agent
             newAvatar = new ScenePresence(client, m_parentScene, m_regInfo, appearance);
-            newAvatar.IsChildAgent = true;
 
             AddScenePresence(newAvatar);
 
@@ -578,6 +577,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="presence"></param>
         protected internal void AddScenePresence(ScenePresence presence)
         {
+            // Always a child when added to the scene
             bool child = presence.IsChildAgent;
 
             if (child)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 91bb3a5..67e59c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -178,6 +178,8 @@ namespace OpenSim.Region.Framework.Scenes
                 {
                     item.LastOwnerID = item.OwnerID;
                     item.OwnerID = ownerId;
+                    item.PermsMask = 0;
+                    item.PermsGranter = UUID.Zero;
                 }
             }
         }
@@ -695,7 +697,6 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 item.ParentID = m_part.UUID;
                 item.ParentPartID = m_part.UUID;
-                item.Flags = m_items[item.ItemID].Flags;
 
                 // If group permissions have been set on, check that the groupID is up to date in case it has
                 // changed since permissions were last set.
@@ -850,7 +851,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="xferManager"></param>
         public void RequestInventoryFile(IClientAPI client, IXfer xferManager)
         {
-            bool changed = CreateInventoryFile();
+            CreateInventoryFile();
 
             if (m_inventorySerial == 0) // No inventory
             {
@@ -1013,6 +1014,8 @@ namespace OpenSim.Region.Framework.Scenes
                     item.BasePermissions &= item.NextPermissions;
                     item.EveryonePermissions &= item.NextPermissions;
                     item.OwnerChanged = true;
+                    item.PermsMask = 0;
+                    item.PermsGranter = UUID.Zero;
                 }
             }
         }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3a40196..1c276fa 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -130,6 +130,13 @@ namespace OpenSim.Region.Framework.Scenes
         private bool m_updateflag;
         private byte m_movementflag;
         private Vector3? m_forceToApply;
+        private TeleportFlags m_teleportFlags;
+        public TeleportFlags TeleportFlags
+        {
+            get { return m_teleportFlags; }
+            set { m_teleportFlags = value; }
+        }
+
         private uint m_requestedSitTargetID;
         private UUID m_requestedSitTargetUUID;
         public bool SitGround = false;
@@ -928,10 +935,6 @@ namespace OpenSim.Region.Framework.Scenes
             //else
             //    m_log.ErrorFormat("[SCENE]: Could not find user info for {0} when making it a root agent", m_uuid);
             
-            // On the next prim update, all objects will be sent
-            //
-            m_sceneViewer.Reset();
-
             m_isChildAgent = false;
 
             // send the animations of the other presences to me
@@ -953,6 +956,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void MakeChildAgent()
         {
+            // Reset these so that teleporting in and walking out isn't seen
+            // as teleporting back
+            m_teleportFlags = TeleportFlags.Default;
+
             // It looks like m_animator is set to null somewhere, and MakeChild
             // is called after that. Probably in aborted teleports.
             if (m_animator == null)
@@ -1108,7 +1115,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// </summary>
         public void CompleteMovement(IClientAPI client)
         {
-            DateTime startTime = DateTime.Now;
+//            DateTime startTime = DateTime.Now;
             
             m_log.DebugFormat(
                 "[SCENE PRESENCE]: Completing movement of {0} into region {1}", 
@@ -1161,9 +1168,9 @@ namespace OpenSim.Region.Framework.Scenes
                     friendsModule.SendFriendsOnlineIfNeeded(ControllingClient);
             }
 
-            m_log.DebugFormat(
-                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
-                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
+//            m_log.DebugFormat(
+//                "[SCENE PRESENCE]: Completing movement of {0} into region {1} took {2}ms", 
+//                client.Name, Scene.RegionInfo.RegionName, (DateTime.Now - startTime).Milliseconds);
         }
 
         /// <summary>
@@ -2952,10 +2959,6 @@ namespace OpenSim.Region.Framework.Scenes
             if ((cAgentData.Throttles != null) && cAgentData.Throttles.Length > 0)
                 ControllingClient.SetChildAgentThrottle(cAgentData.Throttles);
 
-            // Sends out the objects in the user's draw distance if m_sendTasksToChild is true.
-            if (m_scene.m_seeIntoRegionFromNeighbor)
-                m_sceneViewer.Reset();
-
             //cAgentData.AVHeight;
             m_rootRegionHandle = cAgentData.RegionHandle;
             //m_velocity = cAgentData.Velocity;