diff options
author | Dr Scofield | 2009-02-06 16:55:34 +0000 |
---|---|---|
committer | Dr Scofield | 2009-02-06 16:55:34 +0000 |
commit | 9b66108081a8c8cf79faaa6c541554091c40850e (patch) | |
tree | 095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs | |
parent | * removed superfluous constants class (diff) | |
download | opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2 opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz |
This changeset is the step 1 of 2 in refactoring
OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.
The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.
I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!
Diffstat (limited to 'OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs | 77 |
1 files changed, 74 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs index bc4c5b9..fb30321 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueGetModule.cs | |||
@@ -34,6 +34,7 @@ using System.Reflection; | |||
34 | using System.Threading; | 34 | using System.Threading; |
35 | using System.Xml; | 35 | using System.Xml; |
36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
37 | using OpenMetaverse.Packets; | ||
37 | using OpenMetaverse.StructuredData; | 38 | using OpenMetaverse.StructuredData; |
38 | using log4net; | 39 | using log4net; |
39 | using Nini.Config; | 40 | using Nini.Config; |
@@ -42,9 +43,8 @@ using OpenSim.Framework; | |||
42 | using OpenSim.Framework.Communications.Cache; | 43 | using OpenSim.Framework.Communications.Cache; |
43 | using OpenSim.Framework.Communications.Capabilities; | 44 | using OpenSim.Framework.Communications.Capabilities; |
44 | using OpenSim.Framework.Servers; | 45 | using OpenSim.Framework.Servers; |
45 | using OpenSim.Region.Environment.Interfaces; | 46 | using OpenSim.Region.Framework.Interfaces; |
46 | using OpenSim.Region.Interfaces; | 47 | using OpenSim.Region.Framework.Scenes; |
47 | using OpenSim.Region.Environment.Scenes; | ||
48 | 48 | ||
49 | using OSD = OpenMetaverse.StructuredData.OSD; | 49 | using OSD = OpenMetaverse.StructuredData.OSD; |
50 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 50 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
@@ -555,5 +555,76 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue | |||
555 | 555 | ||
556 | return new OSDString("shutdown404!"); | 556 | return new OSDString("shutdown404!"); |
557 | } | 557 | } |
558 | |||
559 | public void DisableSimulator(ulong handle, UUID avatarID) | ||
560 | { | ||
561 | OSD item = EventQueueHelper.DisableSimulator(handle); | ||
562 | Enqueue(item, avatarID); | ||
563 | } | ||
564 | |||
565 | public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID) | ||
566 | { | ||
567 | OSD item = EventQueueHelper.EnableSimulator(handle, endPoint); | ||
568 | Enqueue(item, avatarID); | ||
569 | } | ||
570 | |||
571 | public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) | ||
572 | { | ||
573 | OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath); | ||
574 | Enqueue(item, avatarID); | ||
575 | } | ||
576 | |||
577 | public void TeleportFinishEvent(ulong regionHandle, byte simAccess, | ||
578 | IPEndPoint regionExternalEndPoint, | ||
579 | uint locationID, uint flags, string capsURL, | ||
580 | UUID avatarID) | ||
581 | { | ||
582 | OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint, | ||
583 | locationID, flags, capsURL, avatarID); | ||
584 | Enqueue(item, avatarID); | ||
585 | } | ||
586 | |||
587 | public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, | ||
588 | IPEndPoint newRegionExternalEndPoint, | ||
589 | string capsURL, UUID avatarID, UUID sessionID) | ||
590 | { | ||
591 | OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint, | ||
592 | capsURL, avatarID, sessionID); | ||
593 | Enqueue(item, avatarID); | ||
594 | } | ||
595 | |||
596 | public void ChatterboxInvitation(UUID sessionID, string sessionName, | ||
597 | UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, | ||
598 | uint timeStamp, bool offline, int parentEstateID, Vector3 position, | ||
599 | uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket) | ||
600 | { | ||
601 | OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, | ||
602 | timeStamp, offline, parentEstateID, position, ttl, transactionID, | ||
603 | fromGroup, binaryBucket); | ||
604 | Enqueue(item, toAgent); | ||
605 | m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item); | ||
606 | |||
607 | } | ||
608 | |||
609 | public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, | ||
610 | bool isModerator, bool textMute) | ||
611 | { | ||
612 | OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, | ||
613 | isModerator, textMute); | ||
614 | Enqueue(item, toAgent); | ||
615 | m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); | ||
616 | } | ||
617 | |||
618 | public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID) | ||
619 | { | ||
620 | OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket); | ||
621 | Enqueue(item, avatarID); | ||
622 | } | ||
623 | |||
624 | public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID) | ||
625 | { | ||
626 | OSD item = EventQueueHelper.GroupMembership(groupUpdate); | ||
627 | Enqueue(item, avatarID); | ||
628 | } | ||
558 | } | 629 | } |
559 | } | 630 | } |