aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorubit2012-07-04 18:41:36 +0200
committerubit2012-07-04 18:41:36 +0200
commitc5d2151674f083f1021984c9cb97f1b2dfdb81cf (patch)
treec89d663463e6d6322ed8dc30f38192c9855302f1 /OpenSim/Region/ClientStack
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parent added a timeout paramenter to PollServiceEventArgs, so each type can define ... (diff)
downloadopensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.zip
opensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.gz
opensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.bz2
opensim-SC-c5d2151674f083f1021984c9cb97f1b2dfdb81cf.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index a91b02c..016ed97 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -361,7 +361,7 @@ namespace OpenSim.Region.ClientStack.Linden
361 // This will persist this beyond the expiry of the caps handlers 361 // This will persist this beyond the expiry of the caps handlers
362 MainServer.Instance.AddPollServiceHTTPHandler( 362 MainServer.Instance.AddPollServiceHTTPHandler(
363 capsBase + EventQueueGetUUID.ToString() + "/", 363 capsBase + EventQueueGetUUID.ToString() + "/",
364 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); 364 new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID,1000)); // 1 sec timeout
365 365
366 Random rnd = new Random(Environment.TickCount); 366 Random rnd = new Random(Environment.TickCount);
367 lock (m_ids) 367 lock (m_ids)