diff options
| author | UbitUmarov | 2016-08-11 08:42:34 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-11 08:42:34 +0100 |
| commit | cfab2675ffccb81363c59c23ce4c361ad85fe5a6 (patch) | |
| tree | 67a6066d55c27ca05f34ff32dd3e9bf2e1a8cb83 /OpenSim | |
| parent | to do that don't use slideexpiration; add cap event ChatterBoxForceClose (diff) | |
| download | opensim-SC_OLD-cfab2675ffccb81363c59c23ce4c361ad85fe5a6.zip opensim-SC_OLD-cfab2675ffccb81363c59c23ce4c361ad85fe5a6.tar.gz opensim-SC_OLD-cfab2675ffccb81363c59c23ce4c361ad85fe5a6.tar.bz2 opensim-SC_OLD-cfab2675ffccb81363c59c23ce4c361ad85fe5a6.tar.xz | |
remove code from httptests branch
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index b9038bd..ba3edd6 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, Drop, agentID, SERVER_EQ_TIME_NO_EVENTS)); | 375 | new PollServiceEventArgs(null, GenerateEqgCapPath(eventQueueGetUUID), HasEvents, GetEvents, NoEvents, 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) |
| @@ -582,7 +582,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 582 | OSD item = EventQueueHelper.ChatterBoxForceClose(sessionID, reason); | 582 | OSD item = EventQueueHelper.ChatterBoxForceClose(sessionID, reason); |
| 583 | 583 | ||
| 584 | Enqueue(item, toAgent); | 584 | Enqueue(item, toAgent); |
| 585 | //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); | ||
| 586 | } | 585 | } |
| 587 | 586 | ||
| 588 | public void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID) | 587 | public void ParcelProperties(ParcelPropertiesMessage parcelPropertiesMessage, UUID avatarID) |