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/Grid/AssetServer/Main.cs | 6 +++---
OpenSim/Grid/AssetServer/RestService.cs | 2 +-
OpenSim/Grid/GridServer/GridManager.cs | 4 ++--
OpenSim/Grid/GridServer/Main.cs | 4 ++--
.../DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs | 4 ++--
OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs | 2 +-
OpenSim/Grid/ScriptServer/ScriptServerMain.cs | 2 +-
OpenSim/Grid/UserServer/Main.cs | 4 ++--
OpenSim/Grid/UserServer/UserLoginService.cs | 6 +++---
OpenSim/Grid/UserServer/UserManager.cs | 4 ++--
10 files changed, 19 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Grid')
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 542f87f..e7e5d27 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -33,13 +33,13 @@ using System.Reflection;
using libsecondlife;
using Nini.Config;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
using OpenSim.Framework.Servers;
namespace OpenSim.Grid.AssetServer
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index e4f770d..6993019 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -5,7 +5,7 @@ using System.Xml.Serialization;
using System.Text;
using libsecondlife;
-using OpenSim.Framework.Types;
+using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Console;
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 9800b74..8ac7d6a 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -36,9 +36,9 @@ using Nwc.XmlRpc;
using OpenSim.Framework.Console;
using OpenSim.Framework.Data;
using OpenSim.Framework.Interfaces;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
-using OpenSim.Framework.Configuration;
+using OpenSim.Framework;
namespace OpenSim.Grid.GridServer
{
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index 2015be5..ae1e244 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -34,8 +34,8 @@ using System.Timers;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Servers;
-using OpenSim.Framework.Configuration;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
+using OpenSim.Framework;
using Timer=System.Timers.Timer;
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index e5728fe..8e7b95e 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.Environment.Interfaces;
using OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler;
using OpenSim.Region.ScriptEngine.Common;
using OpenSim.Framework.Console;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
using System.Runtime.Remoting.Lifetime;
namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
@@ -584,7 +584,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
public string llList2Key(List<string> src, int index)
{
- //return OpenSim.Framework.Types.ToStringHyphenated(src[index]);
+ //return OpenSim.Framework.ToStringHyphenated(src[index]);
return src[index].ToString();
}
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
index 9f18f7c..44ed123 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/EventManager.cs
@@ -30,7 +30,7 @@ using System;
using System.Collections.Generic;
using System.Text;
using libsecondlife;
-using OpenSim.Framework.Interfaces;
+using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes.Scripting;
namespace OpenSim.Grid.ScriptEngine.DotNetEngine
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 478915b..82035ac 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
using System.Text;
using System.IO;
using OpenSim.Framework.Console;
-using OpenSim.Framework.Utilities;
+using OpenSim.Framework;
namespace OpenSim.Grid.ScriptServer
{
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
--
cgit v1.1