Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

5 files changed, 78 insertions, 71 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b2f5279..0cb6681 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -920,22 +920,17 @@ namespace OpenSim.Region.Framework.Scenes
 
                     try
                     {
-                        ForEachScenePresence(delegate(ScenePresence agent)
-                                             {
-                                                 // If agent is a root agent.
-                                                 if (!agent.IsChildAgent)
-                                                 {
-                                                     //agent.ControllingClient.new
-                                                     //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
-
-                                                     List<ulong> old = new List<ulong>();
-                                                     old.Add(otherRegion.RegionHandle);
-                                                     agent.DropOldNeighbours(old);
-                                                     if (m_teleportModule != null)
-                                                         m_teleportModule.EnableChildAgent(agent, otherRegion);
-                                                 }
-                                             }
-                            );
+                        ForEachRootScenePresence(delegate(ScenePresence agent)
+                            {
+                                //agent.ControllingClient.new
+                                //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
+
+                                List<ulong> old = new List<ulong>();
+                                old.Add(otherRegion.RegionHandle);
+                                agent.DropOldNeighbours(old);
+                                if (m_teleportModule != null)
+                                    m_teleportModule.EnableChildAgent(agent, otherRegion);
+                            });
                     }
                     catch (NullReferenceException)
                     {
@@ -1070,16 +1065,11 @@ namespace OpenSim.Region.Framework.Scenes
                     GridRegion r = new GridRegion(region);
                     try
                     {
-                        ForEachScenePresence(delegate(ScenePresence agent)
-                                             {
-                                                 // If agent is a root agent.
-                                                 if (!agent.IsChildAgent)
-                                                 {
-                                                     if (m_teleportModule != null)
-                                                         m_teleportModule.EnableChildAgent(agent, r);
-                                                 }
-                                             }
-                            );
+                        ForEachRootScenePresence(delegate(ScenePresence agent)
+                            {
+                                if (m_teleportModule != null)
+                                        m_teleportModule.EnableChildAgent(agent, r);
+                            });
                     }
                     catch (NullReferenceException)
                     {
@@ -1493,11 +1483,10 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="stats">Stats on the Simulator's performance</param>
         private void SendSimStatsPackets(SimStats stats)
         {
-            ForEachScenePresence(
+            ForEachRootScenePresence(
                 delegate(ScenePresence agent)
                 {
-                    if (!agent.IsChildAgent)
-                        agent.ControllingClient.SendSimStats(stats);
+                    agent.ControllingClient.SendSimStats(stats);
                 }
             );
         }
@@ -4463,6 +4452,19 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
+        /// Performs action on all ROOT (not child) scene presences.
+        /// This is just a shortcut function since frequently actions only appy to root SPs
+        /// </summary>
+        /// <param name="action"></param>
+        public void ForEachRootScenePresence(Action<ScenePresence> action)
+        {
+            if(m_sceneGraph != null)
+            {
+                m_sceneGraph.ForEachRootScenePresence(action);
+            }
+        }
+
+        /// <summary>
         /// Performs action on all scene presences.
         /// </summary>
         /// <param name="action"></param>
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 13668ab..a4080ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1265,7 +1265,21 @@ namespace OpenSim.Region.Framework.Scenes
                 }
             }
         }
-        
+
+        /// <summary>
+        /// Performs action on all ROOT (not child) scene presences.
+        /// This is just a shortcut function since frequently actions only appy to root SPs
+        /// </summary>
+        /// <param name="action"></param>
+        public void ForEachRootScenePresence(Action<ScenePresence> action)
+        {
+            ForEachScenePresence(delegate(ScenePresence sp)
+            {
+                if (!sp.IsChildAgent)
+                    action(sp);
+            });
+        }
+
         /// <summary>
         /// Performs action on all scene presences. This can ultimately run the actions in parallel but
         /// any delegates passed in will need to implement their own locking on data they reference and
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index a58b87d..3bfd866 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -458,9 +458,9 @@ namespace OpenSim.Region.Framework.Scenes
             ForEachCurrentScene(
                 delegate(Scene scene)
                 {
-                    scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
+                    scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
                     {
-                        if (!scenePresence.IsChildAgent && (name == null || scenePresence.Name == name))
+                        if (name == null || scenePresence.Name == name)
                         {
                             m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
                                               scenePresence.Firstname,
@@ -481,10 +481,9 @@ namespace OpenSim.Region.Framework.Scenes
             ForEachCurrentScene(
                 delegate(Scene scene)
                 {
-                    scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
+                    scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
                     {
-                        if (!scenePresence.IsChildAgent)
-                            avatars.Add(scenePresence);
+                        avatars.Add(scenePresence);
                     });
                 }
             );
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 6e20d14..0a8edf9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1493,10 +1493,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (volume < 0)
                 volume = 0;
 
-            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
+            m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                if (!sp.IsChildAgent)
-                    sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
+                sp.ControllingClient.SendAttachedSoundGainChange(UUID, (float)volume);
             });
         }
 
@@ -2136,6 +2135,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void PhysicsCollision(EventArgs e)
         {
+//            m_log.DebugFormat("Invoking PhysicsCollision on {0} {1} {2}", Name, LocalId, UUID);
+
             // single threaded here
 
             CollisionEventUpdate a = (CollisionEventUpdate)e;
@@ -2729,10 +2730,8 @@ namespace OpenSim.Region.Framework.Scenes
                 TaskInventory.LockItemsForRead(false);
             }
 
-            m_parentGroup.Scene.ForEachScenePresence(delegate(ScenePresence sp)
+            m_parentGroup.Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
             {
-                if (sp.IsChildAgent)
-                    return;
                 if (!(Util.GetDistanceTo(sp.AbsolutePosition, AbsolutePosition) >= 100))
                     sp.ControllingClient.SendPreLoadSound(objectID, objectID, soundID);
             });
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0f13050..35870c5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2950,19 +2950,15 @@ namespace OpenSim.Region.Framework.Scenes
         public void SendOtherAgentsAvatarDataToMe()
         {
             int count = 0;
-            m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
-                                         {
-                                             // only send information about root agents
-                                             if (scenePresence.IsChildAgent)
-                                                 return;
-                                             
-                                             // only send information about other root agents
-                                             if (scenePresence.UUID == UUID)
-                                                 return;
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
+                        {
+                            // only send information about other root agents
+                            if (scenePresence.UUID == UUID)
+                                return;
                                              
-                                             scenePresence.SendAvatarDataToAgent(this);
-                                             count++;
-                                         });
+                            scenePresence.SendAvatarDataToAgent(this);
+                            count++;
+                        });
 
             m_scene.StatsReporter.AddAgentUpdates(count);
         }
@@ -2996,13 +2992,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             int count = 0;
             m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
-                                         {
-                                             if (scenePresence.UUID == UUID)
-                                                 return;
+                        {
+                            // only send information to other root agents
+                            if (scenePresence.UUID == UUID)
+                                return;
 
-                                             SendAppearanceToAgent(scenePresence);
-                                             count++;
-                                         });
+                            SendAppearanceToAgent(scenePresence);
+                            count++;
+                        });
 
             m_scene.StatsReporter.AddAgentUpdates(count);
         }
@@ -3016,19 +3013,15 @@ namespace OpenSim.Region.Framework.Scenes
             //m_log.DebugFormat("[SCENE PRESENCE] SendOtherAgentsAppearanceToMe: {0} ({1})", Name, UUID);
 
             int count = 0;
-            m_scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
-                                         {
-                                             // only send information about root agents
-                                             if (scenePresence.IsChildAgent)
-                                                 return;
-                                             
-                                             // only send information about other root agents
-                                             if (scenePresence.UUID == UUID)
-                                                 return;
+            m_scene.ForEachRootScenePresence(delegate(ScenePresence scenePresence)
+                        {
+                            // only send information about other root agents
+                            if (scenePresence.UUID == UUID)
+                                return;
                                              
-                                             scenePresence.SendAppearanceToAgent(this);
-                                             count++;
-                                         });
+                            scenePresence.SendAppearanceToAgent(this);
+                            count++;
+                        });
 
             m_scene.StatsReporter.AddAgentUpdates(count);
         }