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.

3 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index b8d9065..492f67f 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -34,8 +34,8 @@ using libsecondlife;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
+using OpenSim.Framework;
 
 namespace OpenSim.Grid.UserServer
 {
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 2aecfa2..1523f81 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -32,9 +32,9 @@ using System.Net;
 using Nwc.XmlRpc;
 using OpenSim.Framework.Data;
 using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
-using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
+using OpenSim.Framework;
+using OpenSim.Framework;
 using OpenSim.Framework.Console;
 
 namespace OpenSim.Grid.UserServer
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 5db4901..2b2bf72 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,9 +29,9 @@ using System;
 using System.Collections;
 using System.Net;
 using Nwc.XmlRpc;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
 using OpenSim.Framework.UserManagement;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
 using libsecondlife;
 
 namespace OpenSim.Grid.UserServer