Merge branch 'master' into careminster

Conflicts:

1 files changed, 14 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a2322b7..a7cca44 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -890,16 +890,16 @@ namespace OpenSim.Region.Framework.Scenes
                     try
                     {
                         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);
-                            });
+                        {
+                            //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 && agent.PresenceType != PresenceType.Npc)
+                                m_teleportModule.EnableChildAgent(agent, otherRegion);
+                        });
                     }
                     catch (NullReferenceException)
                     {
@@ -907,7 +907,6 @@ namespace OpenSim.Region.Framework.Scenes
                         // This shouldn't happen too often anymore.
                         m_log.Error("[SCENE]: Couldn't inform client of regionup because we got a null reference exception");
                     }
-
                 }
                 else
                 {
@@ -1035,10 +1034,10 @@ namespace OpenSim.Region.Framework.Scenes
                     try
                     {
                         ForEachRootScenePresence(delegate(ScenePresence agent)
-                            {
-                                if (m_teleportModule != null)
-                                        m_teleportModule.EnableChildAgent(agent, r);
-                            });
+                        {
+                            if (m_teleportModule != null && agent.PresenceType != PresenceType.Npc)
+                                m_teleportModule.EnableChildAgent(agent, r);
+                        });
                     }
                     catch (NullReferenceException)
                     {