From 3da6a05eaa43e1905d16b87b539c8253bad9a017 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Wed, 30 Apr 2008 21:32:14 +0000 Subject: * Sometimes you know, you do something really stupid. * This is one of those times (should fix build) --- .../ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 2 +- OpenSim/Region/DataSnapshot/LandSnapshot.cs | 2 +- OpenSim/Region/Environment/Interfaces/IHttpRequests.cs | 2 +- OpenSim/Region/Environment/Interfaces/IWorldComm.cs | 2 +- OpenSim/Region/Environment/Interfaces/IXMLRPC.cs | 2 +- OpenSim/Region/Environment/ModuleLoader.cs | 10 ++++++++-- OpenSim/Region/Environment/Scenes/Scene.cs | 2 +- OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs | 2 +- .../Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs | 4 ++-- OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 4 ++-- .../Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs | 2 +- .../Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs | 2 +- .../Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs | 2 +- .../ScriptEngine/Common/ScriptEngineBase/EventManager.cs | 2 +- 14 files changed, 23 insertions(+), 17 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index fed7d9b..db1628c 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -37,8 +37,8 @@ using Mono.Addins; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Servers; +using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes; -using OpenSim.Region.Environment.Modules.Terrain; [assembly : Addin] [assembly : AddinDependency("OpenSim", "0.5")] diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 4c17513..67abccd 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs @@ -34,7 +34,7 @@ using libsecondlife; using log4net; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules.LandManagement; +using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.DataSnapshot diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs index 39d5564..46ba9b2 100644 --- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs @@ -27,7 +27,7 @@ using System.Collections.Generic; using libsecondlife; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; namespace OpenSim.Region.Environment.Interfaces { diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs index 6dd5d81..8a63c54 100644 --- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Environment/Interfaces/IWorldComm.cs @@ -27,7 +27,7 @@ using libsecondlife; using OpenSim.Framework; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Scripting.WorldComm; namespace OpenSim.Region.Environment.Interfaces { diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs index c7f1001..6c1d025 100644 --- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs +++ b/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs @@ -26,7 +26,7 @@ */ using libsecondlife; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; namespace OpenSim.Region.Environment.Interfaces { diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs index 52a6fbd..b34e126 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Environment/ModuleLoader.cs @@ -32,7 +32,13 @@ using System.Reflection; using log4net; using Nini.Config; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules; +//TODO: Why do we reference InstantMessageModule here? +using OpenSim.Region.Environment.Modules.Agent.AssetTransaction; +using OpenSim.Region.Environment.Modules.Avatar.Chat; +using OpenSim.Region.Environment.Modules.Avatar.InstantMessage; +using OpenSim.Region.Environment.Modules.Scripting.DynamicTexture; +using OpenSim.Region.Environment.Modules.Scripting.LoadImageURL; +using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment @@ -139,7 +145,7 @@ namespace OpenSim.Region.Environment //LoadedSharedModules.Add(textureModule.Name, textureModule); - AgentAssetTransactionModule transactionsModule = new AgentAssetTransactionModule(); + AssetTransactionModule transactionsModule = new AssetTransactionModule(); if (m_loadedSharedModules.ContainsKey(transactionsModule.Name)) { m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", transactionsModule.Name, "TransactionModule"); diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index de4270f..4a80b8d 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -40,7 +40,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules.Terrain; +using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes.Scripting; using OpenSim.Region.Physics.Manager; using Caps=OpenSim.Region.Capabilities.Caps; diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs index 8cfc07d..50a3b4e 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs @@ -7,7 +7,7 @@ using log4net; using Nini.Config; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Modules.ExportSerialiser; -using OpenSim.Region.Environment.Modules.Terrain; +using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes; using PumaCode.SvnDotNet.AprSharp; using PumaCode.SvnDotNet.SubversionSharp; diff --git a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs b/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs index 325b788..b3337c4 100644 --- a/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs +++ b/OpenSim/Region/Modules/Terrain/Extensions/DefaultEffects/Effects/ChannelDigger.cs @@ -1,7 +1,7 @@ using System; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules.Terrain; -using OpenSim.Region.Environment.Modules.Terrain.FloodBrushes; +using OpenSim.Region.Environment.Modules.World.Terrain; +using OpenSim.Region.Environment.Modules.World.Terrain.FloodBrushes; namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects { diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 7a3ccea..a3dcc6d 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -36,8 +36,8 @@ using libsecondlife; using OpenSim.Framework; using OpenSim.Region.Environment; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules; -using OpenSim.Region.Environment.Modules.LandManagement; +using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; +using OpenSim.Region.Environment.Modules.World.Land; using OpenSim.Region.Environment.Scenes; using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs index 4b7ee84..097f3b4 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/HttpRequest.cs @@ -27,7 +27,7 @@ using System; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs index 2b68360..55dbabf 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/Listener.cs @@ -26,7 +26,7 @@ */ using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Scripting.WorldComm; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs index 63c529a..b3e5f3e 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/AsyncCommandPlugins/XmlRequest.cs @@ -27,7 +27,7 @@ using System; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase.AsyncCommandPlugins { diff --git a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs index 3bc01a9..261f862 100644 --- a/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/Common/ScriptEngineBase/EventManager.cs @@ -29,7 +29,7 @@ using System; using libsecondlife; using OpenSim.Framework; using OpenSim.Region.Environment; -using OpenSim.Region.Environment.Modules; +using OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase -- cgit v1.1