From a1c8aa4050b7f7a94e02dd40d8cd456f258b4e2b Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Thu, 1 May 2008 15:36:39 +0000 Subject: * Cleaned namespaces of entire solution. OpenSim directories now correspond with namespaces. --- OpenSim/Region/Environment/ModuleLoader.cs | 1 + .../Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs | 4 ++-- .../Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs | 4 ++-- .../Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs | 1 - .../Region/Environment/Modules/Grid/Interregion/InterregionModule.cs | 3 +-- .../Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs | 2 +- .../Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs | 2 +- .../Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs | 2 +- .../Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs | 2 +- .../Region/Environment/Modules/World/Serialiser/SerialiserModule.cs | 1 - OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs | 2 +- .../Environment/Modules/World/TreePopulator/TreePopulatorModule.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.cs | 2 +- OpenSim/Region/Environment/Scenes/SceneEvents.cs | 2 +- 14 files changed, 14 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/Environment') diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs index e0ea94f..3f8b9ff 100644 --- a/OpenSim/Region/Environment/ModuleLoader.cs +++ b/OpenSim/Region/Environment/ModuleLoader.cs @@ -39,6 +39,7 @@ 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; + //TODO: Why do we reference InstantMessageModule here? namespace OpenSim.Region.Environment diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index f8f6ec2..2112f91 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs @@ -34,11 +34,11 @@ using Nini.Config; using Nwc.XmlRpc; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; +using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Capabilities; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using Caps=OpenSim.Region.Capabilities.Caps; +using Caps=OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs index 1527f1e..feb716e 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/SIPVoice/SIPVoiceModule.cs @@ -33,11 +33,11 @@ using log4net; using Nini.Config; using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; +using OpenSim.Framework.Communications.Capabilities; using OpenSim.Framework.Servers; -using OpenSim.Region.Capabilities; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -using Caps=OpenSim.Region.Capabilities.Caps; +using Caps=OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Modules.Avatar.Voice.SIPVoice { diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs index 95d22f0..b717d59 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs +++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/IInterregionModule.cs @@ -1,5 +1,4 @@ using OpenSim.Framework; -using OpenSim.Region.Environment.Modules.Communications.Interregion; using OpenSim.Region.Environment.Scenes; namespace OpenSim.Region.Environment.Modules.Grid.Interregion diff --git a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs index 651ed60..2ca4df9 100644 --- a/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs +++ b/OpenSim/Region/Environment/Modules/Grid/Interregion/InterregionModule.cs @@ -6,10 +6,9 @@ using System.Runtime.Remoting.Channels.Tcp; using Nini.Config; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules.Grid.Interregion; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules.Communications.Interregion +namespace OpenSim.Region.Environment.Modules.Grid.Interregion { public class InterregionModule : IInterregionModule, IRegionModule { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs index 77a418f..40568e7 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IFileSerialiser.cs @@ -27,7 +27,7 @@ using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules.ExportSerialiser +namespace OpenSim.Region.Environment.Modules.World.Serialiser { internal interface IFileSerialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs index e1721ff..331b460 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs @@ -28,7 +28,7 @@ using System.Collections.Generic; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules.ExportSerialiser +namespace OpenSim.Region.Environment.Modules.World.Serialiser { public interface IRegionSerialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs index 40e1771..0d69553 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs @@ -32,7 +32,7 @@ using System.Text; using System.Xml; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules.ExportSerialiser +namespace OpenSim.Region.Environment.Modules.World.Serialiser { internal class SerialiseObjects : IFileSerialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs index dacdbc8..bd85264 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseTerrain.cs @@ -29,7 +29,7 @@ using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Modules.World.Terrain.FileLoaders; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules.ExportSerialiser +namespace OpenSim.Region.Environment.Modules.World.Serialiser { internal class SerialiseTerrain : IFileSerialiser { diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index 75fc428..4406e17 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs @@ -30,7 +30,6 @@ using System.Collections.Generic; using System.IO; using Nini.Config; using OpenSim.Region.Environment.Interfaces; -using OpenSim.Region.Environment.Modules.ExportSerialiser; using OpenSim.Region.Environment.Modules.Framework; using OpenSim.Region.Environment.Scenes; diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs index 85c4cdd..47ce258 100644 --- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs @@ -33,7 +33,7 @@ using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules +namespace OpenSim.Region.Environment.Modules.World.Sun { public class SunModule : IRegionModule { diff --git a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs index 32e45b7..4b22700 100644 --- a/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs +++ b/OpenSim/Region/Environment/Modules/World/TreePopulator/TreePopulatorModule.cs @@ -37,7 +37,7 @@ using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Scenes; -namespace OpenSim.Region.Environment.Modules +namespace OpenSim.Region.Environment.Modules.World.TreePopulator { /// /// Version 2.0 - Very hacky compared to the original. Will fix original and release as 0.3 later. diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 60d6293..3113831 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -43,7 +43,7 @@ using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Modules.World.Terrain; using OpenSim.Region.Environment.Scenes.Scripting; using OpenSim.Region.Physics.Manager; -using Caps=OpenSim.Region.Capabilities.Caps; +using Caps=OpenSim.Framework.Communications.Capabilities.Caps; using Image=System.Drawing.Image; using Timer=System.Timers.Timer; diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs index 769817e..002fc5d 100644 --- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs +++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs @@ -29,7 +29,7 @@ using System; using libsecondlife; using OpenSim.Framework; using OpenSim.Region.Environment.Interfaces; -using Caps=OpenSim.Region.Capabilities.Caps; +using Caps=OpenSim.Framework.Communications.Capabilities.Caps; namespace OpenSim.Region.Environment.Scenes { -- cgit v1.1