diff options
| author | UbitUmarov | 2016-07-27 23:39:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-07-27 23:39:50 +0100 |
| commit | 376084a2e52561cfd1b359aabe9bb64ecc84c2fc (patch) | |
| tree | 77052f68f03eb426b35fc7bd584eeadf9a4b34cf /OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |
| parent | add another gatekeeper login fail reason reply (diff) | |
| parent | first step removing MegaRegions: refuse to run. Thanks to all that made MegaR... (diff) | |
| download | opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.zip opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.gz opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.bz2 opensim-SC-376084a2e52561cfd1b359aabe9bb64ecc84c2fc.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs index 18670f5..f3acacd 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs | |||
| @@ -568,12 +568,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 568 | 568 | ||
| 569 | } | 569 | } |
| 570 | 570 | ||
| 571 | public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID anotherAgent, bool canVoiceChat, | 571 | public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, |
| 572 | bool isModerator, bool textMute) | 572 | bool isModerator, bool textMute, bool isEnterorLeave) |
| 573 | { | 573 | { |
| 574 | OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, | 574 | OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, |
| 575 | isModerator, textMute); | 575 | isModerator, textMute, isEnterorLeave); |
| 576 | Enqueue(item, fromAgent); | 576 | Enqueue(item, toAgent); |
| 577 | //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); | 577 | //m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); |
| 578 | } | 578 | } |
| 579 | 579 | ||