aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs2
-rw-r--r--OpenSim/ApplicationPlugins/Rest/RestPlugin.cs1
-rw-r--r--OpenSim/Framework/Servers/BaseStreamHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs (renamed from OpenSim/Framework/Servers/IHttpAgentHandler.cs)0
-rw-r--r--OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs (renamed from OpenSim/Framework/Servers/IStreamHandler.cs)1
-rw-r--r--OpenSim/Framework/Servers/RestDeserialiseHandler.cs1
-rw-r--r--OpenSim/Framework/Servers/RestSessionService.cs1
-rw-r--r--OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs1
-rw-r--r--OpenSim/Grid/UserServer.Modules/OpenIdService.cs1
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
10 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 81801df..f0a5308 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -29,6 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework.Servers; 31using OpenSim.Framework.Servers;
32using OpenSim.Framework.Servers.Interfaces;
32 33
33namespace OpenSim.ApplicationPlugins.Rest.Inventory 34namespace OpenSim.ApplicationPlugins.Rest.Inventory
34{ 35{
@@ -51,7 +52,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
51 52
52 public class RestHandler : RestPlugin, IRestHandler, IHttpAgentHandler 53 public class RestHandler : RestPlugin, IRestHandler, IHttpAgentHandler
53 { 54 {
54
55 // Handler tables: both stream and REST are supported. The path handlers and their 55 // Handler tables: both stream and REST are supported. The path handlers and their
56 // respective allocators are stored in separate tables. 56 // respective allocators are stored in separate tables.
57 57
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
index f3c3016..727ccfe 100644
--- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
+++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs
@@ -35,6 +35,7 @@ using Nini.Config;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.Interfaces;
38 39
39namespace OpenSim.ApplicationPlugins.Rest 40namespace OpenSim.ApplicationPlugins.Rest
40{ 41{
diff --git a/OpenSim/Framework/Servers/BaseStreamHandler.cs b/OpenSim/Framework/Servers/BaseStreamHandler.cs
index 771def4..836872c 100644
--- a/OpenSim/Framework/Servers/BaseStreamHandler.cs
+++ b/OpenSim/Framework/Servers/BaseStreamHandler.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System.IO; 28using System.IO;
29using OpenSim.Framework.Servers.Interfaces;
29 30
30namespace OpenSim.Framework.Servers 31namespace OpenSim.Framework.Servers
31{ 32{
diff --git a/OpenSim/Framework/Servers/IHttpAgentHandler.cs b/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs
index e6ad57e..e6ad57e 100644
--- a/OpenSim/Framework/Servers/IHttpAgentHandler.cs
+++ b/OpenSim/Framework/Servers/Interfaces/IHttpAgentHandler.cs
diff --git a/OpenSim/Framework/Servers/IStreamHandler.cs b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs
index 76bf4d5..0783dfa 100644
--- a/OpenSim/Framework/Servers/IStreamHandler.cs
+++ b/OpenSim/Framework/Servers/Interfaces/IStreamHandler.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Framework.Servers
53 // Handle request stream, return byte array 53 // Handle request stream, return byte array
54 void Handle(string path, Stream request, Stream response, OSHttpRequest httpReqbuest, OSHttpResponse httpResponse); 54 void Handle(string path, Stream request, Stream response, OSHttpRequest httpReqbuest, OSHttpResponse httpResponse);
55 } 55 }
56
56 public interface IGenericHTTPHandler : IRequestHandler 57 public interface IGenericHTTPHandler : IRequestHandler
57 { 58 {
58 Hashtable Handle(string path, Hashtable request); 59 Hashtable Handle(string path, Hashtable request);
diff --git a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
index 41d86e5..1fba785 100644
--- a/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
+++ b/OpenSim/Framework/Servers/RestDeserialiseHandler.cs
@@ -28,6 +28,7 @@
28using System.IO; 28using System.IO;
29using System.Xml; 29using System.Xml;
30using System.Xml.Serialization; 30using System.Xml.Serialization;
31using OpenSim.Framework.Servers.Interfaces;
31 32
32namespace OpenSim.Framework.Servers 33namespace OpenSim.Framework.Servers
33{ 34{
diff --git a/OpenSim/Framework/Servers/RestSessionService.cs b/OpenSim/Framework/Servers/RestSessionService.cs
index 60da05e..6a8b614 100644
--- a/OpenSim/Framework/Servers/RestSessionService.cs
+++ b/OpenSim/Framework/Servers/RestSessionService.cs
@@ -33,6 +33,7 @@ using System.Text;
33using System.Xml; 33using System.Xml;
34using System.Xml.Serialization; 34using System.Xml.Serialization;
35using log4net; 35using log4net;
36using OpenSim.Framework.Servers.Interfaces;
36 37
37namespace OpenSim.Framework.Servers 38namespace OpenSim.Framework.Servers
38{ 39{
diff --git a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
index 3db073d..c823359 100644
--- a/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
+++ b/OpenSim/Grid/AssetInventoryServer/Plugins/ReferenceFrontendPlugin.cs
@@ -33,6 +33,7 @@ using OpenMetaverse;
33using OpenMetaverse.StructuredData; 33using OpenMetaverse.StructuredData;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Servers.Interfaces;
36using log4net; 37using log4net;
37 38
38namespace OpenSim.Grid.AssetInventoryServer.Plugins 39namespace OpenSim.Grid.AssetInventoryServer.Plugins
diff --git a/OpenSim/Grid/UserServer.Modules/OpenIdService.cs b/OpenSim/Grid/UserServer.Modules/OpenIdService.cs
index 28a8fdb..0dd4f22 100644
--- a/OpenSim/Grid/UserServer.Modules/OpenIdService.cs
+++ b/OpenSim/Grid/UserServer.Modules/OpenIdService.cs
@@ -35,6 +35,7 @@ using DotNetOpenId;
35using DotNetOpenId.Provider; 35using DotNetOpenId.Provider;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.Interfaces;
38 39
39namespace OpenSim.Grid.UserServer.Modules 40namespace OpenSim.Grid.UserServer.Modules
40{ 41{
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index b979bdc..941a7d2 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -39,6 +39,7 @@ using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39using OpenSim.Framework.Communications.Cache;
40using OpenSim.Framework.Console; 40using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 41using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.Interfaces;
42using OpenSim.Framework.Statistics; 43using OpenSim.Framework.Statistics;
43using OpenSim.Region.ClientStack; 44using OpenSim.Region.ClientStack;
44using OpenSim.Region.Framework; 45using OpenSim.Region.Framework;