Merge branch 'master' into careminster-presence-refactor

4 files changed, 35 insertions, 14 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 33069da..f24c53c 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// ChatToClientsEvent is triggered via ChatModule (or
         /// substitutes thereof) when a chat message is actually sent to clients.  Clients will only be sent a 
         /// received chat message if they satisfy various conditions (within audible range, etc.)
-        /// </summary>        
+        /// </summary>
         public delegate void ChatToClientsEvent(
             UUID senderID, HashSet<UUID> receiverIDs, 
             string message, ChatTypeEnum type, Vector3 fromPos, string fromName, 
@@ -1660,8 +1660,8 @@ namespace OpenSim.Region.Framework.Scenes
                             e.Message, e.StackTrace);
                     }
                 }
-            }            
-        }        
+            }
+        }
 
         public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat)
         {
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5428e5d..c3edeb3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -3394,7 +3394,6 @@ namespace OpenSim.Region.Framework.Scenes
                 m_log.WarnFormat("[SCENE]: Deregister from grid failed for region {0}", m_regInfo.RegionName);
         }
 
-
         /// <summary>
         /// Do the work necessary to initiate a new user connection for a particular scene.
         /// At the moment, this consists of setting up the caps infrastructure
@@ -3407,6 +3406,23 @@ namespace OpenSim.Region.Framework.Scenes
         /// also return a reason.</returns>
         public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason)
         {
+            return NewUserConnection(agent, teleportFlags, out reason, true);
+        }
+
+        /// <summary>
+        /// Do the work necessary to initiate a new user connection for a particular scene.
+        /// At the moment, this consists of setting up the caps infrastructure
+        /// The return bool should allow for connections to be refused, but as not all calling paths
+        /// take proper notice of it let, we allowed banned users in still.
+        /// </summary>
+        /// <param name="agent">CircuitData of the agent who is connecting</param>
+        /// <param name="reason">Outputs the reason for the false response on this string</param>
+        /// <param name="requirePresenceLookup">True for normal presence. False for NPC
+        /// or other applications where a full grid/Hypergrid presence may not be required.</param>
+        /// <returns>True if the region accepts this agent.  False if it does not.  False will 
+        /// also return a reason.</returns>
+        public bool NewUserConnection(AgentCircuitData agent, uint teleportFlags, out string reason, bool requirePresenceLookup)
+        {
             bool vialogin = ((teleportFlags & (uint)Constants.TeleportFlags.ViaLogin) != 0 ||
                              (teleportFlags & (uint)Constants.TeleportFlags.ViaHGLogin) != 0);
             reason = String.Empty;
@@ -3456,16 +3472,18 @@ namespace OpenSim.Region.Framework.Scenes
 
             if (sp == null) // We don't have an [child] agent here already
             {
-
-                try
+                if (requirePresenceLookup)
                 {
-                    if (!VerifyUserPresence(agent, out reason))
+                    try
+                    {
+                        if (!VerifyUserPresence(agent, out reason))
+                            return false;
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.ErrorFormat("[CONNECTION BEGIN]: Exception verifying presence " + e.ToString());
                         return false;
-                }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat("[CONNECTION BEGIN]: Exception verifying presence " + e.ToString());
-                    return false;
+                    }
                 }
 
                 try
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index d4e3717..b016065 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -428,11 +428,14 @@ namespace OpenSim.Region.Framework.Scenes
         public bool DeleteSceneObject(UUID uuid, bool resultOfObjectLinked)
         {
             EntityBase entity;
-            if (!Entities.TryGetValue(uuid, out entity) && entity is SceneObjectGroup)
+            if (!Entities.TryGetValue(uuid, out entity) || (!(entity is SceneObjectGroup)))
                 return false;
 
             SceneObjectGroup grp = (SceneObjectGroup)entity;
 
+            if (entity == null)
+                return false;
+
             if (!resultOfObjectLinked)
             {
                 m_numPrim -= grp.PrimCount;
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index ad994c9..4aadfdb 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -804,7 +804,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         private static void ProcessShpTextureEntry(PrimitiveBaseShape shp, XmlTextReader reader)
         {
             byte[] teData = Convert.FromBase64String(reader.ReadElementString("TextureEntry"));
-            shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);   
+            shp.Textures = new Primitive.TextureEntry(teData, 0, teData.Length);
         }
 
         private static void ProcessShpExtraParams(PrimitiveBaseShape shp, XmlTextReader reader)