diff options
| author | Justin Clark-Casey (justincc) | 2012-02-24 23:35:47 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-24 23:35:59 +0000 |
| commit | dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a (patch) | |
| tree | 60020a679a229d078ce3be2f933025c81c677d74 /OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |
| parent | Amend to last commit: synchronize access to queues. (diff) | |
| parent | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:... (diff) | |
| download | opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.zip opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.gz opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.bz2 opensim-SC_OLD-dafcb3bcd7eef4fbda8412cf6d16715fbb8dbd5a.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index 19c9745..b5007cd 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
| @@ -156,8 +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 | |
| 160 | if (! simulatorList.Contains(dest.ServerURI)) | 160 | // bool v = true; |
| 161 | if (!simulatorList.Contains(dest.ServerURI)) | ||
| 161 | { | 162 | { |
| 162 | // we havent seen this simulator before, add it to the list | 163 | // we havent seen this simulator before, add it to the list |
| 163 | // and send it an update | 164 | // and send it an update |