diff options
| author | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-07-15 23:28:02 +0100 |
| commit | eb14e5a1756726b1f296591bb1ac385e4b1372d7 (patch) | |
| tree | 6a7e5e7489785729a2487a0245e0c7e3a9ee99bd /OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs | |
| parent | Add request received/handling stats for caps which are served by http poll ha... (diff) | |
| parent | Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt" (diff) | |
| download | opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.zip opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.gz opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.bz2 opensim-SC_OLD-eb14e5a1756726b1f296591bb1ac385e4b1372d7.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs index f1eb1ad..fd4d48a 100644 --- a/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs +++ b/OpenSim/Region/CoreModules/Framework/GridServiceThrottle/GridServiceThrottleModule.cs | |||
| @@ -140,11 +140,13 @@ namespace OpenSim.Region.CoreModules.Framework | |||
| 140 | Watchdog.UpdateThread(); | 140 | Watchdog.UpdateThread(); |
| 141 | 141 | ||
| 142 | GridRegionRequest request = m_RequestQueue.Dequeue(); | 142 | GridRegionRequest request = m_RequestQueue.Dequeue(); |
| 143 | GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID); | 143 | if (request != null) |
| 144 | 144 | { | |
| 145 | if (r != null && r.RegionHandle != 0) | 145 | GridRegion r = m_scenes[0].GridService.GetRegionByUUID(UUID.Zero, request.regionID); |
| 146 | request.client.SendRegionHandle(request.regionID, r.RegionHandle); | ||
| 147 | 146 | ||
| 147 | if (r != null && r.RegionHandle != 0) | ||
| 148 | request.client.SendRegionHandle(request.regionID, r.RegionHandle); | ||
| 149 | } | ||
| 148 | } | 150 | } |
| 149 | } | 151 | } |
| 150 | } | 152 | } |