diff options
author | Melanie | 2012-04-09 21:40:03 +0100 |
---|---|---|
committer | Melanie | 2012-04-09 21:40:03 +0100 |
commit | 67d4f1d66cef2ff51453f113bdaef375004b17c9 (patch) | |
tree | 975abcb48e2492950ea974567379de88809f57f5 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mantis5502 implementation of some of the new constants (diff) | |
download | opensim-SC_OLD-67d4f1d66cef2ff51453f113bdaef375004b17c9.zip opensim-SC_OLD-67d4f1d66cef2ff51453f113bdaef375004b17c9.tar.gz opensim-SC_OLD-67d4f1d66cef2ff51453f113bdaef375004b17c9.tar.bz2 opensim-SC_OLD-67d4f1d66cef2ff51453f113bdaef375004b17c9.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index b806d91..77e808e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -156,7 +156,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
156 | // that the region position is cached or performance will degrade | 156 | // that the region position is cached or performance will degrade |
157 | Utils.LongToUInts(regionHandle, out x, out y); | 157 | Utils.LongToUInts(regionHandle, out x, out y); |
158 | GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); | 158 | GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); |
159 | // bool v = true; | 159 | if (dest == null) |
160 | continue; | ||
161 | |||
160 | if (!simulatorList.Contains(dest.ServerURI)) | 162 | if (!simulatorList.Contains(dest.ServerURI)) |
161 | { | 163 | { |
162 | // we havent seen this simulator before, add it to the list | 164 | // we havent seen this simulator before, add it to the list |