diff options
| author | UbitUmarov | 2016-08-07 00:24:17 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-07 00:24:17 +0100 |
| commit | 68a4e363ddc22063a55685d48045ea6d87e5e232 (patch) | |
| tree | 48c10dfe30cd8fad9410c5cbd87344fc73c0d19c /OpenSim/Region/ClientStack/Linden/Caps/EventQueue | |
| parent | if a viewer overloads region capability to process RequestMapBlocks, ignore ... (diff) | |
| parent | Merge branch 'master' into httptests (diff) | |
| download | opensim-SC-68a4e363ddc22063a55685d48045ea6d87e5e232.zip opensim-SC-68a4e363ddc22063a55685d48045ea6d87e5e232.tar.gz opensim-SC-68a4e363ddc22063a55685d48045ea6d87e5e232.tar.bz2 opensim-SC-68a4e363ddc22063a55685d48045ea6d87e5e232.tar.xz | |
Merge branch 'httptests' of opensimulator.org:/var/git/opensim into httptests
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue')
| -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 6d548ad..f3acacd 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -372,7 +372,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 372 | 372 | ||
| 373 | caps.RegisterPollHandler( | 373 | caps.RegisterPollHandler( |
| 374 | "EventQueueGet", | 374 | "EventQueueGet", |
| 375 | new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, agentID, SERVER_EQ_TIME_NO_EVENTS)); | 375 | new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, Drop, agentID, SERVER_EQ_TIME_NO_EVENTS)); |
| 376 | } | 376 | } |
| 377 | 377 | ||
| 378 | public bool HasEvents(UUID requestID, UUID agentID) | 378 | public bool HasEvents(UUID requestID, UUID agentID) |