From 9b66108081a8c8cf79faaa6c541554091c40850e Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 6 Feb 2009 16:55:34 +0000 Subject: 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! --- .../Framework/EventQueue/EventQueueGetModule.cs | 77 +++++++++++++++++++++- .../Framework/EventQueue/EventQueueHelper.cs | 74 ++++++++++----------- 2 files changed, 111 insertions(+), 40 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Framework/EventQueue') 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; using System.Threading; using System.Xml; using OpenMetaverse; +using OpenMetaverse.Packets; using OpenMetaverse.StructuredData; using log4net; using Nini.Config; @@ -42,9 +43,8 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using OSD = OpenMetaverse.StructuredData.OSD; using OSDMap = OpenMetaverse.StructuredData.OSDMap; @@ -555,5 +555,76 @@ namespace OpenSim.Region.Environment.Modules.Framework.EventQueue return new OSDString("shutdown404!"); } + + public void DisableSimulator(ulong handle, UUID avatarID) + { + OSD item = EventQueueHelper.DisableSimulator(handle); + Enqueue(item, avatarID); + } + + public void EnableSimulator(ulong handle, IPEndPoint endPoint, UUID avatarID) + { + OSD item = EventQueueHelper.EnableSimulator(handle, endPoint); + Enqueue(item, avatarID); + } + + public void EstablishAgentCommunication(UUID avatarID, IPEndPoint endPoint, string capsPath) + { + OSD item = EventQueueHelper.EstablishAgentCommunication(avatarID, endPoint.ToString(), capsPath); + Enqueue(item, avatarID); + } + + public void TeleportFinishEvent(ulong regionHandle, byte simAccess, + IPEndPoint regionExternalEndPoint, + uint locationID, uint flags, string capsURL, + UUID avatarID) + { + OSD item = EventQueueHelper.TeleportFinishEvent(regionHandle, simAccess, regionExternalEndPoint, + locationID, flags, capsURL, avatarID); + Enqueue(item, avatarID); + } + + public void CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, + IPEndPoint newRegionExternalEndPoint, + string capsURL, UUID avatarID, UUID sessionID) + { + OSD item = EventQueueHelper.CrossRegion(handle, pos, lookAt, newRegionExternalEndPoint, + capsURL, avatarID, sessionID); + Enqueue(item, avatarID); + } + + public void ChatterboxInvitation(UUID sessionID, string sessionName, + UUID fromAgent, string message, UUID toAgent, string fromName, byte dialog, + uint timeStamp, bool offline, int parentEstateID, Vector3 position, + uint ttl, UUID transactionID, bool fromGroup, byte[] binaryBucket) + { + OSD item = EventQueueHelper.ChatterboxInvitation(sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, + timeStamp, offline, parentEstateID, position, ttl, transactionID, + fromGroup, binaryBucket); + Enqueue(item, toAgent); + m_log.InfoFormat("########### eq ChatterboxInvitation #############\n{0}", item); + + } + + public void ChatterBoxSessionAgentListUpdates(UUID sessionID, UUID fromAgent, UUID toAgent, bool canVoiceChat, + bool isModerator, bool textMute) + { + OSD item = EventQueueHelper.ChatterBoxSessionAgentListUpdates(sessionID, fromAgent, canVoiceChat, + isModerator, textMute); + Enqueue(item, toAgent); + m_log.InfoFormat("########### eq ChatterBoxSessionAgentListUpdates #############\n{0}", item); + } + + public void ParcelProperties(ParcelPropertiesPacket parcelPropertiesPacket, UUID avatarID) + { + OSD item = Environment.EventQueueHelper.ParcelProperties(parcelPropertiesPacket); + Enqueue(item, avatarID); + } + + public void GroupMembership(AgentGroupDataUpdatePacket groupUpdate, UUID avatarID) + { + OSD item = EventQueueHelper.GroupMembership(groupUpdate); + Enqueue(item, avatarID); + } } } diff --git a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs index 546d9d1..b38ddba 100644 --- a/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/Environment/Modules/Framework/EventQueue/EventQueueHelper.cs @@ -71,11 +71,11 @@ namespace OpenSim.Region.Environment return llsdEvent; } - public static OSD EnableSimulator(ulong Handle, IPEndPoint endPoint) + public static OSD EnableSimulator(ulong handle, IPEndPoint endPoint) { OSDMap llsdSimInfo = new OSDMap(3); - llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(Handle))); + llsdSimInfo.Add("Handle", new OSDBinary(ulongToByteArray(handle))); llsdSimInfo.Add("IP", new OSDBinary(endPoint.Address.GetAddressBytes())); llsdSimInfo.Add("Port", new OSDInteger(endPoint.Port)); @@ -88,11 +88,11 @@ namespace OpenSim.Region.Environment return buildEvent("EnableSimulator", llsdBody); } - public static OSD DisableSimulator(ulong Handle) + public static OSD DisableSimulator(ulong handle) { //OSDMap llsdSimInfo = new OSDMap(1); - //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(Handle))); + //llsdSimInfo.Add("Handle", new OSDBinary(regionHandleToByteArray(handle))); //OSDArray arr = new OSDArray(1); //arr.Add(llsdSimInfo); @@ -103,57 +103,57 @@ namespace OpenSim.Region.Environment return buildEvent("DisableSimulator", llsdBody); } - public static OSD CrossRegion(ulong Handle, Vector3 pos, Vector3 lookAt, - IPEndPoint newRegionExternalEndPoint, - string capsURL, UUID AgentID, UUID SessionID) + public static OSD CrossRegion(ulong handle, Vector3 pos, Vector3 lookAt, + IPEndPoint newRegionExternalEndPoint, + string capsURL, UUID agentID, UUID sessionID) { - OSDArray LookAtArr = new OSDArray(3); - LookAtArr.Add(OSD.FromReal(lookAt.X)); - LookAtArr.Add(OSD.FromReal(lookAt.Y)); - LookAtArr.Add(OSD.FromReal(lookAt.Z)); + OSDArray lookAtArr = new OSDArray(3); + lookAtArr.Add(OSD.FromReal(lookAt.X)); + lookAtArr.Add(OSD.FromReal(lookAt.Y)); + lookAtArr.Add(OSD.FromReal(lookAt.Z)); - OSDArray PositionArr = new OSDArray(3); - PositionArr.Add(OSD.FromReal(pos.X)); - PositionArr.Add(OSD.FromReal(pos.Y)); - PositionArr.Add(OSD.FromReal(pos.Z)); + OSDArray positionArr = new OSDArray(3); + positionArr.Add(OSD.FromReal(pos.X)); + positionArr.Add(OSD.FromReal(pos.Y)); + positionArr.Add(OSD.FromReal(pos.Z)); - OSDMap InfoMap = new OSDMap(2); - InfoMap.Add("LookAt", LookAtArr); - InfoMap.Add("Position", PositionArr); + OSDMap infoMap = new OSDMap(2); + infoMap.Add("LookAt", lookAtArr); + infoMap.Add("Position", positionArr); - OSDArray InfoArr = new OSDArray(1); - InfoArr.Add(InfoMap); + OSDArray infoArr = new OSDArray(1); + infoArr.Add(infoMap); - OSDMap AgentDataMap = new OSDMap(2); - AgentDataMap.Add("AgentID", OSD.FromUUID(AgentID)); - AgentDataMap.Add("SessionID", OSD.FromUUID(SessionID)); + OSDMap agentDataMap = new OSDMap(2); + agentDataMap.Add("AgentID", OSD.FromUUID(agentID)); + agentDataMap.Add("SessionID", OSD.FromUUID(sessionID)); - OSDArray AgentDataArr = new OSDArray(1); - AgentDataArr.Add(AgentDataMap); + OSDArray agentDataArr = new OSDArray(1); + agentDataArr.Add(agentDataMap); - OSDMap RegionDataMap = new OSDMap(4); - RegionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(Handle))); - RegionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); - RegionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); - RegionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); + OSDMap regionDataMap = new OSDMap(4); + regionDataMap.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(handle))); + regionDataMap.Add("SeedCapability", OSD.FromString(capsURL)); + regionDataMap.Add("SimIP", OSD.FromBinary(newRegionExternalEndPoint.Address.GetAddressBytes())); + regionDataMap.Add("SimPort", OSD.FromInteger(newRegionExternalEndPoint.Port)); - OSDArray RegionDataArr = new OSDArray(1); - RegionDataArr.Add(RegionDataMap); + OSDArray regionDataArr = new OSDArray(1); + regionDataArr.Add(regionDataMap); OSDMap llsdBody = new OSDMap(3); - llsdBody.Add("Info", InfoArr); - llsdBody.Add("AgentData", AgentDataArr); - llsdBody.Add("RegionData", RegionDataArr); + llsdBody.Add("Info", infoArr); + llsdBody.Add("AgentData", agentDataArr); + llsdBody.Add("RegionData", regionDataArr); return buildEvent("CrossedRegion", llsdBody); } public static OSD TeleportFinishEvent( ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, - uint locationID, uint flags, string capsURL, UUID AgentID) + uint locationID, uint flags, string capsURL, UUID agentID) { OSDMap info = new OSDMap(); - info.Add("AgentID", OSD.FromUUID(AgentID)); + info.Add("AgentID", OSD.FromUUID(agentID)); info.Add("LocationID", OSD.FromInteger(4)); // TODO what is this? info.Add("RegionHandle", OSD.FromBinary(ulongToByteArray(regionHandle))); info.Add("SeedCapability", OSD.FromString(capsURL)); -- cgit v1.1