aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMelanie2012-02-21 10:20:56 +0000
committerMelanie2012-02-21 10:20:56 +0000
commit03e7bc1526d24efe23f61f6a8dee88010ccfdb8c (patch)
treec2c2afef43a697dec1373ef5987f7d163031e5e2 /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
parentBoth 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff)
downloadopensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.zip
opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.gz
opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.bz2
opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.xz
Merge branch 'master' into careminster
Conflicts:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs29
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
890 try 890 try
891 { 891 {
892 ForEachRootScenePresence(delegate(ScenePresence agent) 892 ForEachRootScenePresence(delegate(ScenePresence agent)
893 { 893 {
894 //agent.ControllingClient.new 894 //agent.ControllingClient.new
895 //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo()); 895 //this.CommsManager.InterRegion.InformRegionOfChildAgent(otherRegion.RegionHandle, agent.ControllingClient.RequestClientInfo());
896 896
897 List<ulong> old = new List<ulong>(); 897 List<ulong> old = new List<ulong>();
898 old.Add(otherRegion.RegionHandle); 898 old.Add(otherRegion.RegionHandle);
899 agent.DropOldNeighbours(old); 899 agent.DropOldNeighbours(old);
900 if (m_teleportModule != null) 900 if (m_teleportModule != null && agent.PresenceType != PresenceType.Npc)
901 m_teleportModule.EnableChildAgent(agent, otherRegion); 901 m_teleportModule.EnableChildAgent(agent, otherRegion);
902 }); 902 });
903 } 903 }
904 catch (NullReferenceException) 904 catch (NullReferenceException)
905 { 905 {
@@ -907,7 +907,6 @@ namespace OpenSim.Region.Framework.Scenes
907 // This shouldn't happen too often anymore. 907 // This shouldn't happen too often anymore.
908 m_log.Error("[SCENE]: Couldn't inform client of regionup because we got a null reference exception"); 908 m_log.Error("[SCENE]: Couldn't inform client of regionup because we got a null reference exception");
909 } 909 }
910
911 } 910 }
912 else 911 else
913 { 912 {
@@ -1035,10 +1034,10 @@ namespace OpenSim.Region.Framework.Scenes
1035 try 1034 try
1036 { 1035 {
1037 ForEachRootScenePresence(delegate(ScenePresence agent) 1036 ForEachRootScenePresence(delegate(ScenePresence agent)
1038 { 1037 {
1039 if (m_teleportModule != null) 1038 if (m_teleportModule != null && agent.PresenceType != PresenceType.Npc)
1040 m_teleportModule.EnableChildAgent(agent, r); 1039 m_teleportModule.EnableChildAgent(agent, r);
1041 }); 1040 });
1042 } 1041 }
1043 catch (NullReferenceException) 1042 catch (NullReferenceException)
1044 { 1043 {