From a89d097355526d4dc52a75a9734c6a02c3008ef4 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 9 Feb 2009 09:16:15 +0000 Subject: [PATCH] starting phase 2 of the OpenSim.Region.Environment commit: relocating OpenSim.Region.Environment.Modules.Agent en bloc to OpenSim.Region.CoreModules --- .../LoadRegions/LoadRegionsPlugin.cs | 2 +- OpenSim/Region/Application/HGOpenSimNode.cs | 2 +- .../AgentAssetTransactionsManager.cs | 2 +- .../AgentAssetsTransactions.cs | 2 +- .../AssetTransactionModule.cs | 2 +- .../AssetTransaction/AssetXferUploader.cs | 2 +- .../Agent/Capabilities/CapabilitiesModule.cs | 2 +- .../TextureDownload/TextureDownloadModule.cs | 2 +- .../TextureDownload/TextureNotFoundSender.cs | 2 +- .../UserTextureDownloadService.cs | 2 +- .../Agent/TextureSender/J2KDecoderModule.cs | 2 +- .../TextureSender/Tests/TextureSenderTests.cs | 2 +- .../Agent/TextureSender/TextureSender.cs | 2 +- .../Agent/Xfer/XferModule.cs | 2 +- .../Tests/Common/Setup/SceneSetupHelpers.cs | 2 +- prebuild.xml | 48 +++++++++++++++++++ 16 files changed, 63 insertions(+), 15 deletions(-) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/AssetTransaction/AgentAssetTransactionsManager.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/AssetTransaction/AgentAssetsTransactions.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/AssetTransaction/AssetTransactionModule.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/AssetTransaction/AssetXferUploader.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/Capabilities/CapabilitiesModule.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/TextureDownload/TextureDownloadModule.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/TextureDownload/TextureNotFoundSender.cs (98%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/TextureDownload/UserTextureDownloadService.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/TextureSender/J2KDecoderModule.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/TextureSender/Tests/TextureSenderTests.cs (98%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/TextureSender/TextureSender.cs (99%) rename OpenSim/Region/{Environment/Modules => CoreModules}/Agent/Xfer/XferModule.cs (99%) diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs index 024c910a87..b9a0a643cb 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs @@ -38,7 +38,7 @@ using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; -using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; +using OpenSim.Region.CoreModules.Agent.AssetTransaction; namespace OpenSim.ApplicationPlugins.LoadRegions { diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 57c6fa3c21..f85c9dd4cc 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs @@ -146,7 +146,7 @@ namespace OpenSim m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version); } - public void RunCommand(string module, string[] cp) + void RunCommand(string module, string[] cp) { List cmdparams = new List(cp); if (cmdparams.Count < 1) diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs rename to OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index 82325b7641..2be1eaa014 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs @@ -33,7 +33,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction +namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { /* public class AgentAssetTransactionsManager diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs rename to OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs index adfbbad6fd..b4dbaa112d 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AgentAssetsTransactions.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs @@ -32,7 +32,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; -namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction +namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { /// /// Manage asset transactions for a single agent. diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs rename to OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs index 1eb6795879..77dfd44c40 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetTransactionModule.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs @@ -33,7 +33,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction +namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions { diff --git a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs rename to OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs index e1e1065161..aef26649c3 100644 --- a/OpenSim/Region/Environment/Modules/Agent/AssetTransaction/AssetXferUploader.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs @@ -35,7 +35,7 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Modules.Agent.AssetTransaction +namespace OpenSim.Region.CoreModules.Agent.AssetTransaction { public class AssetXferUploader { diff --git a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs rename to OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 861e9f4808..4f7f177be9 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs @@ -38,7 +38,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using Caps = OpenSim.Framework.Communications.Capabilities.Caps; -namespace OpenSim.Region.Environment.Modules.Agent.Capabilities +namespace OpenSim.Region.CoreModules.Agent.Capabilities { public class CapabilitiesModule : IRegionModule, ICapabilitiesModule { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs rename to OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs index 47902958f6..107855dc0b 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureDownloadModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs @@ -36,7 +36,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Framework.Communications.Cache; using BlockingQueue = OpenSim.Framework.BlockingQueue; -namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload +namespace OpenSim.Region.CoreModules.Agent.TextureDownload { public class TextureDownloadModule : IRegionModule { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs similarity index 98% rename from OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs rename to OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs index 51aa48e0d7..73092829a3 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/TextureNotFoundSender.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureNotFoundSender.cs @@ -32,7 +32,7 @@ using OpenMetaverse.Packets; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload +namespace OpenSim.Region.CoreModules.Agent.TextureDownload { /// /// Sends a 'texture not found' packet back to the client diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs rename to OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs index 38d96db2be..675bb0f183 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureDownload/UserTextureDownloadService.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs @@ -35,7 +35,7 @@ using OpenSim.Framework.Statistics; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Modules.Agent.TextureDownload +namespace OpenSim.Region.CoreModules.Agent.TextureDownload { /// /// This module sets up texture senders in response to client texture requests, and places them on a diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs rename to OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 852459279e..df672b8880 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs @@ -39,7 +39,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Modules.Agent.TextureSender +namespace OpenSim.Region.CoreModules.Agent.TextureSender { public class J2KDecoderModule : IRegionModule, IJ2KDecoder { diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs similarity index 98% rename from OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs rename to OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs index cfac86855e..f0587bb91e 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/Tests/TextureSenderTests.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/Tests/TextureSenderTests.cs @@ -33,7 +33,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Tests.Common.Mock; -namespace OpenSim.Region.Environment.Modules.Agent.TextureSender +namespace OpenSim.Region.CoreModules.Agent.TextureSender { [TestFixture] public class UserTextureSenderTests diff --git a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs rename to OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs index 7d7efda4d1..b3ac62429a 100644 --- a/OpenSim/Region/Environment/Modules/Agent/TextureSender/TextureSender.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/TextureSender.cs @@ -32,7 +32,7 @@ using log4net; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; -namespace OpenSim.Region.Environment.Modules.Agent.TextureSender +namespace OpenSim.Region.CoreModules.Agent.TextureSender { /// /// A TextureSender handles the process of receiving a texture requested by the client from the diff --git a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs similarity index 99% rename from OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs rename to OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs index 1d18b4b0d0..cb81c0d2ba 100644 --- a/OpenSim/Region/Environment/Modules/Agent/Xfer/XferModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs @@ -33,7 +33,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -namespace OpenSim.Region.Environment.Modules.Agent.Xfer +namespace OpenSim.Region.CoreModules.Agent.Xfer { public class XferModule : IRegionModule, IXfer { diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index 5540141444..3a0f72aa75 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs @@ -36,7 +36,7 @@ using OpenSim.Region.Physics.Manager; using OpenSim.Region.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; -using OpenSim.Region.Environment.Modules.Agent.Capabilities; +using OpenSim.Region.CoreModules.Agent.Capabilities; using OpenSim.Tests.Common.Mock; namespace OpenSim.Tests.Common.Setup diff --git a/prebuild.xml b/prebuild.xml index a6fe84f64c..8031b4689f 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -842,6 +842,52 @@ + + + + ../../../bin/ + + + + + ../../../bin/ + + + + ../../../bin/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1162,6 +1208,7 @@ + @@ -2326,6 +2373,7 @@ +