Nonowrking intermadiate commit,, DO NOT USE

author: Melanie Thielker 2009-05-18 12:10:56 +0000
committer: Melanie Thielker 2009-05-18 12:10:56 +0000
commit: 72adbd976cce9c20e908e4e9046d8b039194851c (patch)
tree: dfd21d2af0c84e5502575c16513202390a9c41d0 /OpenSim
parent: Logically group the server connector with it's handlers (diff)
download: opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.zip
opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.gz
opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.bz2
opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.xz
8 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Servers/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs
index 8e3bc14..52f8e2b 100644
--- a/OpenSim/Servers/AssetServer/AssetServerMain.cs
+++ b/OpenSim/Server/AssetServer/AssetServerMain.cs
@@ -26,10 +26,10 @@
 */
 using System;
-using OpenSim.Servers.Base;
+using OpenSim.Server.Base;
-using OpenSim.Servers.AssetServer.Handlers;
+using OpenSim.Server.AssetServer.Handlers;
-namespace OpenSim.Servers.AssetServer
+namespace OpenSim.Server.AssetServer
 {
    public class AssetServer
    {
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
index 8606d38..8606d38 100644
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs
+++ b/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
index e90353b..e90353b 100644
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
+++ b/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
index 7bb3364..7bb3364 100644
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
+++ b/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs
diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
index 5a05101..5a05101 100644
--- a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
+++ b/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs
diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 5286744..dc12cf9 100644
--- a/OpenSim/Servers/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers.HttpServer;
 using log4net;
 using Nini.Config;
-namespace OpenSim.Servers.Base
+namespace OpenSim.Server.Base
 {
    public class HttpServerBase : ServicesServerBase
    {
diff --git a/OpenSim/Servers/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 834576b..ae0c3d4 100644
--- a/OpenSim/Servers/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -32,7 +32,7 @@ using System.Xml;
 using System.Xml.Serialization;
 using System.Text;
-namespace OpenSim.Servers.Base
+namespace OpenSim.Server.Base
 {
    public static class ServerUtils
    {
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 6129407..5350bce 100644
--- a/OpenSim/Servers/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -37,7 +37,7 @@ using log4net.Core;
 using log4net.Repository;
 using Nini.Config;
-namespace OpenSim.Servers.Base
+namespace OpenSim.Server.Base
 {
    public class ServicesServerBase
    {
author	Melanie Thielker	2009-05-18 12:10:56 +0000
committer	Melanie Thielker	2009-05-18 12:10:56 +0000
commit	72adbd976cce9c20e908e4e9046d8b039194851c (patch)
tree	dfd21d2af0c84e5502575c16513202390a9c41d0 /OpenSim
parent	Logically group the server connector with it's handlers (diff)
download	opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.zip opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.gz opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.bz2 opensim-SC-72adbd976cce9c20e908e4e9046d8b039194851c.tar.xz

diff --git a/OpenSim/Servers/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs index 8e3bc14..52f8e2b 100644 --- a/OpenSim/Servers/AssetServer/AssetServerMain.cs +++ b/OpenSim/Server/AssetServer/AssetServerMain.cs
@@ -26,10 +26,10 @@
26	*/	26	*/
27		27
28	using System;	28	using System;
29	using OpenSim.Servers.Base;	29	using OpenSim.Server.Base;
30	using OpenSim.Servers.AssetServer.Handlers;	30	using OpenSim.Server.AssetServer.Handlers;
31		31
32	namespace OpenSim.Servers.AssetServer	32	namespace OpenSim.Server.AssetServer
33	{	33	{
34	public class AssetServer	34	public class AssetServer
35	{	35	{


diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs index 8606d38..8606d38 100644 --- a/OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs +++ b/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs


diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs index e90353b..e90353b 100644 --- a/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs +++ b/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs


diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs index 7bb3364..7bb3364 100644 --- a/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs +++ b/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs


diff --git a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs index 5a05101..5a05101 100644 --- a/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs +++ b/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs


diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs index 5286744..dc12cf9 100644 --- a/OpenSim/Servers/Base/HttpServerBase.cs +++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -33,7 +33,7 @@ using OpenSim.Framework.Servers.HttpServer;
33	using log4net;	33	using log4net;
34	using Nini.Config;	34	using Nini.Config;
35		35
36	namespace OpenSim.Servers.Base	36	namespace OpenSim.Server.Base
37	{	37	{
38	public class HttpServerBase : ServicesServerBase	38	public class HttpServerBase : ServicesServerBase
39	{	39	{


diff --git a/OpenSim/Servers/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 834576b..ae0c3d4 100644 --- a/OpenSim/Servers/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -32,7 +32,7 @@ using System.Xml;
32	using System.Xml.Serialization;	32	using System.Xml.Serialization;
33	using System.Text;	33	using System.Text;
34		34
35	namespace OpenSim.Servers.Base	35	namespace OpenSim.Server.Base
36	{	36	{
37	public static class ServerUtils	37	public static class ServerUtils
38	{	38	{


diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 6129407..5350bce 100644 --- a/OpenSim/Servers/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -37,7 +37,7 @@ using log4net.Core;
37	using log4net.Repository;	37	using log4net.Repository;
38	using Nini.Config;	38	using Nini.Config;
39		39
40	namespace OpenSim.Servers.Base	40	namespace OpenSim.Server.Base
41	{	41	{
42	public class ServicesServerBase	42	public class ServicesServerBase
43	{	43	{