diff options
| author | Diva Canto | 2009-09-21 11:05:20 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-21 11:05:20 -0700 |
| commit | 6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735 (patch) | |
| tree | 552d9966f891056b3fac1868aefb7491bf381882 /OpenSim/Region/CoreModules | |
| parent | Added grid handler and grid remote connector. (diff) | |
| parent | Add a UUID param to NoEvents in PollServiceEventArgs to make it more generic (diff) | |
| download | opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.zip opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.tar.gz opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.tar.bz2 opensim-SC-6d0e7b6a6caa7653d9d74fe7ca1b0c992362d735.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index 34d46a0..26eed42 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
| @@ -350,7 +350,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
| 350 | lock (queue) | 350 | lock (queue) |
| 351 | { | 351 | { |
| 352 | if (queue.Count == 0) | 352 | if (queue.Count == 0) |
| 353 | return NoEvents(); | 353 | return NoEvents(pAgentId); |
| 354 | element = queue.Dequeue(); // 15s timeout | 354 | element = queue.Dequeue(); // 15s timeout |
| 355 | } | 355 | } |
| 356 | 356 | ||
| @@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
| 398 | //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]); | 398 | //m_log.DebugFormat("[EVENTQUEUE]: sending response for {0} in region {1}: {2}", agentID, m_scene.RegionInfo.RegionName, responsedata["str_response_string"]); |
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | public Hashtable NoEvents() | 401 | public Hashtable NoEvents(UUID agentID) |
| 402 | { | 402 | { |
| 403 | Hashtable responsedata = new Hashtable(); | 403 | Hashtable responsedata = new Hashtable(); |
| 404 | responsedata["int_response_code"] = 502; | 404 | responsedata["int_response_code"] = 502; |