diff options
author | Diva Canto | 2009-09-22 14:15:53 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-22 14:15:53 -0700 |
commit | 0fc2b73e7b33ace583aacf8a0bfe1f184f045f99 (patch) | |
tree | 3015532d8575d9ef17e13198efe5b8d49a549172 /OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |
parent | Added HGGridConnector and related code. (diff) | |
parent | Thank you, Intari, for a patch that implements the missing pieces of (diff) | |
download | opensim-SC_OLD-0fc2b73e7b33ace583aacf8a0bfe1f184f045f99.zip opensim-SC_OLD-0fc2b73e7b33ace583aacf8a0bfe1f184f045f99.tar.gz opensim-SC_OLD-0fc2b73e7b33ace583aacf8a0bfe1f184f045f99.tar.bz2 opensim-SC_OLD-0fc2b73e7b33ace583aacf8a0bfe1f184f045f99.tar.xz |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index 57c5198..0cdd9a8 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -316,7 +316,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
316 | 316 | ||
317 | // This will persist this beyond the expiry of the caps handlers | 317 | // This will persist this beyond the expiry of the caps handlers |
318 | MainServer.Instance.AddPollServiceHTTPHandler( | 318 | MainServer.Instance.AddPollServiceHTTPHandler( |
319 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePoll, new PollServiceEventArgs(HasEvents, GetEvents, NoEvents, agentID)); | 319 | capsBase + EventQueueGetUUID.ToString() + "/", EventQueuePoll, new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); |
320 | 320 | ||
321 | Random rnd = new Random(Environment.TickCount); | 321 | Random rnd = new Random(Environment.TickCount); |
322 | lock (m_ids) | 322 | lock (m_ids) |