diff options
| author | BlueWall | 2012-02-25 14:33:56 -0500 |
|---|---|---|
| committer | BlueWall | 2012-02-25 14:33:56 -0500 |
| commit | 4177571a786f6ece38b29dc60328348fbe45b481 (patch) | |
| tree | bc06a7f13fc5e751cfab5ef58bd3e9b612e12ba9 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | Merge branch 'master' into v3_support (diff) | |
| parent | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented (diff) | |
| download | opensim-SC_OLD-4177571a786f6ece38b29dc60328348fbe45b481.zip opensim-SC_OLD-4177571a786f6ece38b29dc60328348fbe45b481.tar.gz opensim-SC_OLD-4177571a786f6ece38b29dc60328348fbe45b481.tar.bz2 opensim-SC_OLD-4177571a786f6ece38b29dc60328348fbe45b481.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 19c9745..4d98f00 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -156,8 +156,8 @@ 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 | // bool v = true; |
| 160 | if (! simulatorList.Contains(dest.ServerURI)) | 160 | if (!simulatorList.Contains(dest.ServerURI)) |
| 161 | { | 161 | { |
| 162 | // we havent seen this simulator before, add it to the list | 162 | // we havent seen this simulator before, add it to the list |
| 163 | // and send it an update | 163 | // and send it an update |