diff options
author | Dahlia Trimble | 2009-01-27 06:14:11 +0000 |
---|---|---|
committer | Dahlia Trimble | 2009-01-27 06:14:11 +0000 |
commit | c747990187f7ad655434c61d033de0ebbbf2da8d (patch) | |
tree | 584be8eeb77af1451010c6c556c0f441f7e2b47f /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
parent | correct formatting if parcel description field in event queue message (diff) | |
download | opensim-SC_OLD-c747990187f7ad655434c61d033de0ebbbf2da8d.zip opensim-SC_OLD-c747990187f7ad655434c61d033de0ebbbf2da8d.tar.gz opensim-SC_OLD-c747990187f7ad655434c61d033de0ebbbf2da8d.tar.bz2 opensim-SC_OLD-c747990187f7ad655434c61d033de0ebbbf2da8d.tar.xz |
Send groups list via event queue
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index e58549a..42bb783 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1216,7 +1216,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1216 | 1216 | ||
1217 | OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( | 1217 | OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( |
1218 | new UUID("00000000-68f9-1111-024e-222222111123"), | 1218 | new UUID("00000000-68f9-1111-024e-222222111123"), |
1219 | "Test Group", fromAgent, message, toAgent, fromName, dialog, 0, | 1219 | "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0, |
1220 | false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); | 1220 | false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); |
1221 | 1221 | ||
1222 | eq.Enqueue(Item, toAgent); | 1222 | eq.Enqueue(Item, toAgent); |
@@ -7600,7 +7600,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
7600 | Groupupdate.AgentData.AgentID = AgentId; | 7600 | Groupupdate.AgentData.AgentID = AgentId; |
7601 | OutPacket(Groupupdate, ThrottleOutPacketType.Task); | 7601 | OutPacket(Groupupdate, ThrottleOutPacketType.Task); |
7602 | 7602 | ||
7603 | try | ||
7604 | { | ||
7605 | IEventQueue eq = Scene.RequestModuleInterface<IEventQueue>(); | ||
7606 | if (eq != null) | ||
7607 | { | ||
7608 | OSD Item = Environment.EventQueueHelper.GroupMembership(Groupupdate); | ||
7609 | |||
7610 | eq.Enqueue(Item, this.AgentId); | ||
7611 | } | ||
7612 | } | ||
7613 | catch (Exception ex) | ||
7614 | { | ||
7615 | m_log.Error("Unable to send group membership data via eventqueue - exception: " + ex.ToString()); | ||
7616 | m_log.Warn("sending group membership data via UDP"); | ||
7617 | OutPacket(Groupupdate, ThrottleOutPacketType.Task); | ||
7618 | } | ||
7603 | } | 7619 | } |
7620 | |||
7621 | |||
7604 | public void SendGroupNameReply(UUID groupLLUID, string GroupName) | 7622 | public void SendGroupNameReply(UUID groupLLUID, string GroupName) |
7605 | { | 7623 | { |
7606 | UUIDGroupNameReplyPacket pack = new UUIDGroupNameReplyPacket(); | 7624 | UUIDGroupNameReplyPacket pack = new UUIDGroupNameReplyPacket(); |