diff options
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/AssetServer/AssetServerMain.cs | 2 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs) | 5 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs (renamed from OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs) | 4 |
5 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Server/AssetServer/AssetServerMain.cs b/OpenSim/Server/AssetServer/AssetServerMain.cs index 52f8e2b..b08c8cf 100644 --- a/OpenSim/Server/AssetServer/AssetServerMain.cs +++ b/OpenSim/Server/AssetServer/AssetServerMain.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenSim.Server.Base; | 29 | using OpenSim.Server.Base; |
30 | using OpenSim.Server.AssetServer.Handlers; | 30 | using OpenSim.Server.Handlers.Asset; |
31 | 31 | ||
32 | namespace OpenSim.Server.AssetServer | 32 | namespace OpenSim.Server.AssetServer |
33 | { | 33 | { |
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index 8606d38..64014f5 100644 --- a/OpenSim/Server/AssetServer/Handlers/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
@@ -27,12 +27,11 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using OpenSim.Servers.Base; | 30 | using OpenSim.Server.Base; |
31 | using OpenSim.Servers.AssetServer.Handlers; | ||
32 | using OpenSim.Services.Interfaces; | 31 | using OpenSim.Services.Interfaces; |
33 | using OpenSim.Framework.Servers.HttpServer; | 32 | using OpenSim.Framework.Servers.HttpServer; |
34 | 33 | ||
35 | namespace OpenSim.Servers.AssetServer.Handlers | 34 | namespace OpenSim.Server.Handlers.Asset |
36 | { | 35 | { |
37 | public class AssetServiceConnector | 36 | public class AssetServiceConnector |
38 | { | 37 | { |
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs index e90353b..f9eceeb 100644 --- a/OpenSim/Server/AssetServer/Handlers/AssetServerDeleteHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs | |||
@@ -35,12 +35,12 @@ using System.Text; | |||
35 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using System.Xml.Serialization; | 37 | using System.Xml.Serialization; |
38 | using OpenSim.Servers.Base; | 38 | using OpenSim.Server.Base; |
39 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
42 | 42 | ||
43 | namespace OpenSim.Servers.AssetServer.Handlers | 43 | namespace OpenSim.Server.Handlers.Asset |
44 | { | 44 | { |
45 | public class AssetServerDeleteHandler : BaseStreamHandler | 45 | public class AssetServerDeleteHandler : BaseStreamHandler |
46 | { | 46 | { |
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs index 7bb3364..0ededca 100644 --- a/OpenSim/Server/AssetServer/Handlers/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
@@ -35,12 +35,12 @@ using System.Text; | |||
35 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using System.Xml.Serialization; | 37 | using System.Xml.Serialization; |
38 | using OpenSim.Servers.Base; | 38 | using OpenSim.Server.Base; |
39 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
42 | 42 | ||
43 | namespace OpenSim.Servers.AssetServer.Handlers | 43 | namespace OpenSim.Server.Handlers.Asset |
44 | { | 44 | { |
45 | public class AssetServerGetHandler : BaseStreamHandler | 45 | public class AssetServerGetHandler : BaseStreamHandler |
46 | { | 46 | { |
diff --git a/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs index 5a05101..5ca9eae 100644 --- a/OpenSim/Server/AssetServer/Handlers/AssetServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | |||
@@ -35,12 +35,12 @@ using System.Text; | |||
35 | using System.Text.RegularExpressions; | 35 | using System.Text.RegularExpressions; |
36 | using System.Xml; | 36 | using System.Xml; |
37 | using System.Xml.Serialization; | 37 | using System.Xml.Serialization; |
38 | using OpenSim.Servers.Base; | 38 | using OpenSim.Server.Base; |
39 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
40 | using OpenSim.Framework; | 40 | using OpenSim.Framework; |
41 | using OpenSim.Framework.Servers.HttpServer; | 41 | using OpenSim.Framework.Servers.HttpServer; |
42 | 42 | ||
43 | namespace OpenSim.Servers.AssetServer.Handlers | 43 | namespace OpenSim.Server.Handlers.Asset |
44 | { | 44 | { |
45 | public class AssetServerPostHandler : BaseStreamHandler | 45 | public class AssetServerPostHandler : BaseStreamHandler |
46 | { | 46 | { |