aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Server/AssetServer/AssetServerMain.cs (renamed from OpenSim/Servers/AssetServer/AssetServerMain.cs)6
-rw-r--r--OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs (renamed from OpenSim/Servers/AssetServer/Handlers/AssetServerConnector.cs)0
-rw-r--r--OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs (renamed from OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs)0
-rw-r--r--OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs (renamed from OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs)0
-rw-r--r--OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs (renamed from OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs)0
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs (renamed from OpenSim/Servers/Base/HttpServerBase.cs)2
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs (renamed from OpenSim/Servers/Base/ServerUtils.cs)2
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs (renamed from OpenSim/Servers/Base/ServicesServerBase.cs)2
-rw-r--r--prebuild.xml12
9 files changed, 12 insertions, 12 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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using OpenSim.Servers.Base; 29using OpenSim.Server.Base;
30using OpenSim.Servers.AssetServer.Handlers; 30using OpenSim.Server.AssetServer.Handlers;
31 31
32namespace OpenSim.Servers.AssetServer 32namespace 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;
33using log4net; 33using log4net;
34using Nini.Config; 34using Nini.Config;
35 35
36namespace OpenSim.Servers.Base 36namespace 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;
32using System.Xml.Serialization; 32using System.Xml.Serialization;
33using System.Text; 33using System.Text;
34 34
35namespace OpenSim.Servers.Base 35namespace 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;
37using log4net.Repository; 37using log4net.Repository;
38using Nini.Config; 38using Nini.Config;
39 39
40namespace OpenSim.Servers.Base 40namespace OpenSim.Server.Base
41{ 41{
42 public class ServicesServerBase 42 public class ServicesServerBase
43 { 43 {
diff --git a/prebuild.xml b/prebuild.xml
index 62286aa..feeb159 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1359,7 +1359,7 @@
1359 </Files> 1359 </Files>
1360 </Project> 1360 </Project>
1361 1361
1362 <Project name="OpenSim.Servers.Base" path="OpenSim/Servers/Base" type="Library"> 1362 <Project name="OpenSim.Server.Base" path="OpenSim/Server/Base" type="Library">
1363 <Configuration name="Debug"> 1363 <Configuration name="Debug">
1364 <Options> 1364 <Options>
1365 <OutputPath>../../../bin/</OutputPath> 1365 <OutputPath>../../../bin/</OutputPath>
@@ -1407,7 +1407,7 @@
1407 <Reference name="OpenSim.Framework"/> 1407 <Reference name="OpenSim.Framework"/>
1408 <Reference name="OpenSim.Framework.Console"/> 1408 <Reference name="OpenSim.Framework.Console"/>
1409 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1409 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1410 <Reference name="OpenSim.Servers.Base"/> 1410 <Reference name="OpenSim.Server.Base"/>
1411 <Reference name="OpenSim.Services.Base" /> 1411 <Reference name="OpenSim.Services.Base" />
1412 <Reference name="OpenSim.Services.Interfaces"/> 1412 <Reference name="OpenSim.Services.Interfaces"/>
1413 <Reference name="Nini.dll" /> 1413 <Reference name="Nini.dll" />
@@ -1418,7 +1418,7 @@
1418 </Files> 1418 </Files>
1419 </Project> 1419 </Project>
1420 1420
1421 <Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/AssetServer" type="Exe"> 1421 <Project name="OpenSim.Server.AssetServer" path="OpenSim/Server/AssetServer" type="Exe">
1422 <Configuration name="Debug"> 1422 <Configuration name="Debug">
1423 <Options> 1423 <Options>
1424 <OutputPath>../../../bin/</OutputPath> 1424 <OutputPath>../../../bin/</OutputPath>
@@ -1438,8 +1438,8 @@
1438 <Reference name="OpenSim.Framework"/> 1438 <Reference name="OpenSim.Framework"/>
1439 <Reference name="OpenSim.Framework.Console"/> 1439 <Reference name="OpenSim.Framework.Console"/>
1440 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1440 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1441 <Reference name="OpenSim.Servers.Base"/> 1441 <Reference name="OpenSim.Server.Base"/>
1442 <Reference name="OpenSim.Servers.AssetServer.Handlers"/> 1442 <Reference name="OpenSim.Server.AssetServer.Handlers"/>
1443 <Reference name="OpenSim.Services.Base" /> 1443 <Reference name="OpenSim.Services.Base" />
1444 <Reference name="OpenSim.Services.Interfaces"/> 1444 <Reference name="OpenSim.Services.Interfaces"/>
1445 <Reference name="Nini.dll" /> 1445 <Reference name="Nini.dll" />
@@ -1475,7 +1475,7 @@
1475 <Reference name="OpenSim.Framework.Communications"/> 1475 <Reference name="OpenSim.Framework.Communications"/>
1476 <Reference name="OpenSim.Data" /> 1476 <Reference name="OpenSim.Data" />
1477 <Reference name="OpenSim.Region.Framework" /> 1477 <Reference name="OpenSim.Region.Framework" />
1478 <Reference name="OpenSim.Servers.Base" /> 1478 <Reference name="OpenSim.Server.Base" />
1479 <Reference name="OpenSim.Services.Connectors" /> 1479 <Reference name="OpenSim.Services.Connectors" />
1480 <Reference name="OpenSim.Services.Base" /> 1480 <Reference name="OpenSim.Services.Base" />
1481 <Reference name="OpenSim.Services.Interfaces" /> 1481 <Reference name="OpenSim.Services.Interfaces" />