aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs7
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs7
2 files changed, 10 insertions, 4 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index fcf99cd..c776c36 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
30using System.Reflection; 31using System.Reflection;
31using System.Text; 32using System.Text;
32using System.Xml; 33using System.Xml;
@@ -59,7 +60,8 @@ namespace OpenSim.Grid.AssetServer
59 m_assetProvider = assetProvider; 60 m_assetProvider = assetProvider;
60 } 61 }
61 62
62 public override byte[] Handle(string path, Stream request) 63 public override byte[] Handle(string path, Stream request,
64 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
63 { 65 {
64 string param = GetParam(path); 66 string param = GetParam(path);
65 byte[] result = new byte[] {}; 67 byte[] result = new byte[] {};
@@ -121,7 +123,8 @@ namespace OpenSim.Grid.AssetServer
121 private OpenAsset_Main m_assetManager; 123 private OpenAsset_Main m_assetManager;
122 private IAssetProvider m_assetProvider; 124 private IAssetProvider m_assetProvider;
123 125
124 public override byte[] Handle(string path, Stream request) 126 public override byte[] Handle(string path, Stream request,
127 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
125 { 128 {
126 string param = GetParam(path); 129 string param = GetParam(path);
127 130
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index a0aeacc..a5b256d 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Net;
30using System.Reflection; 31using System.Reflection;
31using libsecondlife; 32using libsecondlife;
32using log4net; 33using log4net;
@@ -51,7 +52,8 @@ namespace OpenSim.Grid.MessagingServer
51 52
52 } 53 }
53 54
54 public override byte[] Handle(string path, Stream request) 55 public override byte[] Handle(string path, Stream request,
56 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
55 { 57 {
56 string param = GetParam(path); 58 string param = GetParam(path);
57 byte[] result = new byte[] {}; 59 byte[] result = new byte[] {};
@@ -84,7 +86,8 @@ namespace OpenSim.Grid.MessagingServer
84 { 86 {
85 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 87 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
86 88
87 public override byte[] Handle(string path, Stream request) 89 public override byte[] Handle(string path, Stream request,
90 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
88 { 91 {
89 string param = GetParam(path); 92 string param = GetParam(path);
90 93