From 3d8219f6c7faa256d6a13ab7925f75d83af95b78 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 29 Oct 2007 21:46:25 +0000
Subject: as per the "Filesystem cleanup for OpenSim repository" mailing list
 thread. Have flattened the OpenSim.Framework project/namespace. The problem
 is that the namespace is still wrong as its "OpenSim.Framework" while the
 directory is "OpenSim\Framework\General" , so we need to decide if we change
 the directory or correct the namespace. Note this has lead to a big flat
 project, but I think a lot of the files we most likely don't even use any
 longer. And others belong in other projects/namespaces anyway.

---
 OpenSim/Region/Environment/Modules/AssetDownloadModule.cs   | 1 +
 OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs   | 2 +-
 OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs  | 1 +
 OpenSim/Region/Environment/Modules/ChatModule.cs            | 2 +-
 OpenSim/Region/Environment/Modules/DynamicTextureModule.cs  | 3 +--
 OpenSim/Region/Environment/Modules/InstantMessageModule.cs  | 3 ++-
 OpenSim/Region/Environment/Modules/TextureDownloadModule.cs | 3 +--
 OpenSim/Region/Environment/Modules/WorldCommModule.cs       | 2 +-
 OpenSim/Region/Environment/Modules/XMLRPCModule.cs          | 2 +-
 OpenSim/Region/Environment/Modules/XferModule.cs            | 1 +
 10 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Environment/Modules')

diff --git a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
index 3ce3e4e..e414713 100644
--- a/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/AssetDownloadModule.cs
@@ -29,6 +29,7 @@
 using OpenSim.Framework.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using OpenSim.Framework;
 using Nini.Config;
 
 namespace OpenSim.Region.Environment.Modules
diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index cb8c758..456d838 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using libsecondlife;
 using Nini.Config;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 
diff --git a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
index 4bdb61b..802655f 100644
--- a/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarProfilesModule.cs
@@ -30,6 +30,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using OpenSim.Framework;
 using Nini.Config;
 
 namespace OpenSim.Region.Environment.Modules
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index c2611d0..bdb8ee5 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -34,7 +34,7 @@ using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
diff --git a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
index 4e29977..7c852dc 100644
--- a/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
+++ b/OpenSim/Region/Environment/Modules/DynamicTextureModule.cs
@@ -29,8 +29,7 @@
 using System;
 using System.Collections.Generic;
 using libsecondlife;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
index 77ff24b..9ac1d76 100644
--- a/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
+++ b/OpenSim/Region/Environment/Modules/InstantMessageModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Console;
+using OpenSim.Framework;
 using Nini.Config;
 
 namespace OpenSim.Region.Environment.Modules
@@ -53,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules
             }
         }
 
-        void OnNewClient(OpenSim.Framework.Interfaces.IClientAPI client)
+        void OnNewClient(OpenSim.Framework.IClientAPI client)
         {
             client.OnInstantMessage += OnInstantMessage;
         }
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 56e20d1..5eeeca6 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -31,8 +31,7 @@ using System.Threading;
 using libsecondlife;
 using libsecondlife.Packets;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Types;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using Nini.Config;
diff --git a/OpenSim/Region/Environment/Modules/WorldCommModule.cs b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
index c7e0f8f..a697162 100644
--- a/OpenSim/Region/Environment/Modules/WorldCommModule.cs
+++ b/OpenSim/Region/Environment/Modules/WorldCommModule.cs
@@ -33,7 +33,7 @@ using System.Text;
 using System.Threading;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 3a5b3c6..dd84778 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -32,7 +32,7 @@ using System.Net.Sockets;
 using System.Threading;
 using libsecondlife;
 using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Servers;
diff --git a/OpenSim/Region/Environment/Modules/XferModule.cs b/OpenSim/Region/Environment/Modules/XferModule.cs
index 2adb1c9..e555475 100644
--- a/OpenSim/Region/Environment/Modules/XferModule.cs
+++ b/OpenSim/Region/Environment/Modules/XferModule.cs
@@ -32,6 +32,7 @@ using libsecondlife;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
+using OpenSim.Framework;
 using Nini.Config;
 
 namespace OpenSim.Region.Environment.Modules
-- 
cgit v1.1