diff options
| author | Melanie | 2012-07-06 20:51:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-06 20:51:18 +0100 |
| commit | 26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2 (patch) | |
| tree | bf9802d765a4965dd1b42c4b2d3145b5813c0c1f /OpenSim/Region/ClientStack/Linden/Caps/EventQueue | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | added llSetVelocity. will refuse to work on vehicles and on attachments ( th... (diff) | |
| download | opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.zip opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.gz opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.bz2 opensim-SC-26d89777d88c9abfa35fed0b78bcd8f93c3d0bf2.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 2 |
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 0d7390b..ebfe687 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 377 | // TODO: Add EventQueueGet name/description for diagnostics | 377 | // TODO: Add EventQueueGet name/description for diagnostics |
| 378 | MainServer.Instance.AddPollServiceHTTPHandler( | 378 | MainServer.Instance.AddPollServiceHTTPHandler( |
| 379 | eventQueueGetPath, | 379 | eventQueueGetPath, |
| 380 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID)); | 380 | new PollServiceEventArgs(null, HasEvents, GetEvents, NoEvents, agentID, 1000)); |
| 381 | 381 | ||
| 382 | // m_log.DebugFormat( | 382 | // m_log.DebugFormat( |
| 383 | // "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", | 383 | // "[EVENT QUEUE GET MODULE]: Registered EQG handler {0} for {1} in {2}", |