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! --- OpenSim/Region/ClientStack/IClientNetworkServer.cs | 2 +- .../Region/ClientStack/LindenUDP/LLClientView.cs | 27 +++++++--------------- .../Region/ClientStack/LindenUDP/LLFileTransfer.cs | 4 ++-- .../Region/ClientStack/LindenUDP/LLImageManager.cs | 2 +- .../Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 +- .../ClientStack/LindenUDP/Tests/MockScene.cs | 2 +- .../Region/ClientStack/RegionApplicationBase.cs | 3 ++- 7 files changed, 16 insertions(+), 26 deletions(-) (limited to 'OpenSim/Region/ClientStack') diff --git a/OpenSim/Region/ClientStack/IClientNetworkServer.cs b/OpenSim/Region/ClientStack/IClientNetworkServer.cs index 2d0630b..0073389 100644 --- a/OpenSim/Region/ClientStack/IClientNetworkServer.cs +++ b/OpenSim/Region/ClientStack/IClientNetworkServer.cs @@ -29,7 +29,7 @@ using System.Net; using System.Net.Sockets; using Nini.Config; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Region.ClientStack diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 42dbbee..59df3f1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -41,9 +41,8 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Statistics; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; using Timer = System.Timers.Timer; namespace OpenSim.Region.ClientStack.LindenUDP @@ -475,7 +474,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_PacketHandler.OnPacketStats += PopulateStats; RegisterLocalPacketHandlers(); - m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface()); + m_imageManager = new LLImageManager(this, m_assetCache,Scene.RequestModuleInterface()); } public void SetDebugPacketLevel(int newDebugPacketLevel) @@ -1214,20 +1213,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP { dialog = 17; - OSD Item = Environment.EventQueueHelper.ChatterboxInvitation( + eq.ChatterboxInvitation( new UUID("00000000-68f9-1111-024e-222222111123"), "OpenSimulator Testing", fromAgent, message, toAgent, fromName, dialog, 0, false, 0, new Vector3(), 1, transactionID, fromGroup, binaryBucket); - eq.Enqueue(Item, toAgent); - m_log.Info("########### eq ChatterboxInvitation #############\n" + Item); - - Item = Environment.EventQueueHelper.ChatterBoxSessionAgentListUpdates( + eq.ChatterBoxSessionAgentListUpdates( new UUID("00000000-68f9-1111-024e-222222111123"), - fromAgent, false, false, false); - - eq.Enqueue(Item, toAgent); - m_log.Info("########### eq ChatterBoxSessionAgentListUpdates #############\n" + Item); + fromAgent, toAgent, false, false, false); } System.Console.WriteLine("SendInstantMessage: " + msg); @@ -3193,9 +3186,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP IEventQueue eq = Scene.RequestModuleInterface(); if (eq != null) { - OSD Item = Environment.EventQueueHelper.ParcelProperties(updatePacket); - - eq.Enqueue(Item, this.AgentId); + eq.ParcelProperties(updatePacket, this.AgentId); } } catch (Exception ex) @@ -7608,9 +7599,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP IEventQueue eq = Scene.RequestModuleInterface(); if (eq != null) { - OSD Item = Environment.EventQueueHelper.GroupMembership(Groupupdate); - - eq.Enqueue(Item, this.AgentId); + eq.GroupMembership(Groupupdate, this.AgentId); } } catch (Exception ex) diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs index d2d86b9..b801f7a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLFileTransfer.cs @@ -35,8 +35,8 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Statistics; -using OpenSim.Region.Interfaces; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Interfaces; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ClientStack.LindenUDP { diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs index f903c45..9b71770 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLImageManager.cs @@ -29,7 +29,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Interfaces; +using OpenSim.Region.Framework.Interfaces; using C5; using OpenSim.Framework.Communications.Cache; using OpenMetaverse.Imaging; diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 1615767..f53d485 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -36,7 +36,7 @@ using log4net; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ClientStack.LindenUDP { diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs index 6880973..90d7d63 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/MockScene.cs @@ -29,7 +29,7 @@ using System.Xml; using Nini.Config; using OpenMetaverse; using OpenSim.Framework; -using OpenSim.Region.Environment.Scenes; +using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.ClientStack.LindenUDP.Tests { diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index cc3edff..0921dbd 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -36,8 +36,9 @@ using OpenSim.Framework; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; +using OpenSim.Region.Framework; +using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Physics.Manager; namespace OpenSim.Region.ClientStack -- cgit v1.1