aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Servers/AssetServer/AssetServerConnector.cs (renamed from OpenSim/Servers/Asset/AssetServerConnector.cs)1
-rw-r--r--OpenSim/Servers/AssetServer/AssetServerMain.cs (renamed from OpenSim/Servers/Asset/AssetServerMain.cs)0
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs (renamed from OpenSim/Servers/Asset/AssetServerDeleteHandler.cs)2
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs (renamed from OpenSim/Servers/Asset/AssetServerGetHandler.cs)2
-rw-r--r--OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs (renamed from OpenSim/Servers/Asset/AssetServerPostHandler.cs)2
-rw-r--r--OpenSim/Servers/UserServer/UserServerConnector.cs (renamed from OpenSim/Servers/User/UserServerConnector.cs)0
-rw-r--r--OpenSim/Servers/UserServer/UserServerMain.cs (renamed from OpenSim/Servers/User/UserServerMain.cs)0
-rw-r--r--prebuild.xml38
8 files changed, 39 insertions, 6 deletions
diff --git a/OpenSim/Servers/Asset/AssetServerConnector.cs b/OpenSim/Servers/AssetServer/AssetServerConnector.cs
index 0dcfb5e..1801e68 100644
--- a/OpenSim/Servers/Asset/AssetServerConnector.cs
+++ b/OpenSim/Servers/AssetServer/AssetServerConnector.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using Nini.Config; 29using Nini.Config;
30using OpenSim.Servers.Base; 30using OpenSim.Servers.Base;
31using OpenSim.Servers.AssetServer.Handlers;
31using OpenSim.Services.Interfaces; 32using OpenSim.Services.Interfaces;
32using OpenSim.Framework.Servers.HttpServer; 33using OpenSim.Framework.Servers.HttpServer;
33 34
diff --git a/OpenSim/Servers/Asset/AssetServerMain.cs b/OpenSim/Servers/AssetServer/AssetServerMain.cs
index bc738d7..bc738d7 100644
--- a/OpenSim/Servers/Asset/AssetServerMain.cs
+++ b/OpenSim/Servers/AssetServer/AssetServerMain.cs
diff --git a/OpenSim/Servers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
index 010d7a7..e90353b 100644
--- a/OpenSim/Servers/Asset/AssetServerDeleteHandler.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerDeleteHandler.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
42 42
43namespace OpenSim.Servers.AssetServer 43namespace OpenSim.Servers.AssetServer.Handlers
44{ 44{
45 public class AssetServerDeleteHandler : BaseStreamHandler 45 public class AssetServerDeleteHandler : BaseStreamHandler
46 { 46 {
diff --git a/OpenSim/Servers/Asset/AssetServerGetHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
index 935a07c..7bb3364 100644
--- a/OpenSim/Servers/Asset/AssetServerGetHandler.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerGetHandler.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
42 42
43namespace OpenSim.Servers.AssetServer 43namespace OpenSim.Servers.AssetServer.Handlers
44{ 44{
45 public class AssetServerGetHandler : BaseStreamHandler 45 public class AssetServerGetHandler : BaseStreamHandler
46 { 46 {
diff --git a/OpenSim/Servers/Asset/AssetServerPostHandler.cs b/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
index 3bc7267..5a05101 100644
--- a/OpenSim/Servers/Asset/AssetServerPostHandler.cs
+++ b/OpenSim/Servers/AssetServer/Handlers/AssetServerPostHandler.cs
@@ -40,7 +40,7 @@ using OpenSim.Services.Interfaces;
40using OpenSim.Framework; 40using OpenSim.Framework;
41using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
42 42
43namespace OpenSim.Servers.AssetServer 43namespace OpenSim.Servers.AssetServer.Handlers
44{ 44{
45 public class AssetServerPostHandler : BaseStreamHandler 45 public class AssetServerPostHandler : BaseStreamHandler
46 { 46 {
diff --git a/OpenSim/Servers/User/UserServerConnector.cs b/OpenSim/Servers/UserServer/UserServerConnector.cs
index 15b09bc..15b09bc 100644
--- a/OpenSim/Servers/User/UserServerConnector.cs
+++ b/OpenSim/Servers/UserServer/UserServerConnector.cs
diff --git a/OpenSim/Servers/User/UserServerMain.cs b/OpenSim/Servers/UserServer/UserServerMain.cs
index 7dea5d7..7dea5d7 100644
--- a/OpenSim/Servers/User/UserServerMain.cs
+++ b/OpenSim/Servers/UserServer/UserServerMain.cs
diff --git a/prebuild.xml b/prebuild.xml
index c3f8458..c6f0dda 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1382,7 +1382,7 @@
1382 </Files> 1382 </Files>
1383 </Project> 1383 </Project>
1384 1384
1385 <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/User" type="Exe"> 1385 <Project name="OpenSim.Servers.UserServer" path="OpenSim/Servers/UserServer" type="Exe">
1386 <Configuration name="Debug"> 1386 <Configuration name="Debug">
1387 <Options> 1387 <Options>
1388 <OutputPath>../../../bin/</OutputPath> 1388 <OutputPath>../../../bin/</OutputPath>
@@ -1412,7 +1412,38 @@
1412 </Files> 1412 </Files>
1413 </Project> 1413 </Project>
1414 1414
1415 <Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/Asset" type="Exe"> 1415 <Project name="OpenSim.Servers.AssetServer.Handlers" path="OpenSim/Servers/AssetServer/Handlers" type="Library">
1416 <Configuration name="Debug">
1417 <Options>
1418 <OutputPath>../../../../bin/</OutputPath>
1419 </Options>
1420 </Configuration>
1421 <Configuration name="Release">
1422 <Options>
1423 <OutputPath>../../../../bin/</OutputPath>
1424 </Options>
1425 </Configuration>
1426
1427 <ReferencePath>../../../../bin/</ReferencePath>
1428 <Reference name="System"/>
1429 <Reference name="System.Xml"/>
1430 <Reference name="OpenMetaverseTypes.dll"/>
1431 <Reference name="OpenMetaverse.dll"/>
1432 <Reference name="OpenSim.Framework"/>
1433 <Reference name="OpenSim.Framework.Console"/>
1434 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1435 <Reference name="OpenSim.Servers.Base"/>
1436 <Reference name="OpenSim.Services.Base" />
1437 <Reference name="OpenSim.Services.Interfaces"/>
1438 <Reference name="Nini.dll" />
1439 <Reference name="log4net.dll"/>
1440
1441 <Files>
1442 <Match pattern="*.cs" recurse="true"/>
1443 </Files>
1444 </Project>
1445
1446 <Project name="OpenSim.Servers.AssetServer" path="OpenSim/Servers/AssetServer" type="Exe">
1416 <Configuration name="Debug"> 1447 <Configuration name="Debug">
1417 <Options> 1448 <Options>
1418 <OutputPath>../../../bin/</OutputPath> 1449 <OutputPath>../../../bin/</OutputPath>
@@ -1433,13 +1464,14 @@
1433 <Reference name="OpenSim.Framework.Console"/> 1464 <Reference name="OpenSim.Framework.Console"/>
1434 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 1465 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1435 <Reference name="OpenSim.Servers.Base"/> 1466 <Reference name="OpenSim.Servers.Base"/>
1467 <Reference name="OpenSim.Servers.AssetServer.Handlers"/>
1436 <Reference name="OpenSim.Services.Base" /> 1468 <Reference name="OpenSim.Services.Base" />
1437 <Reference name="OpenSim.Services.Interfaces"/> 1469 <Reference name="OpenSim.Services.Interfaces"/>
1438 <Reference name="Nini.dll" /> 1470 <Reference name="Nini.dll" />
1439 <Reference name="log4net.dll"/> 1471 <Reference name="log4net.dll"/>
1440 1472
1441 <Files> 1473 <Files>
1442 <Match pattern="*.cs" recurse="true"/> 1474 <Match pattern="*.cs" recurse="false"/>
1443 </Files> 1475 </Files>
1444 </Project> 1476 </Project>
1445 1477