diff options
author | Melanie | 2011-12-05 20:32:35 +0000 |
---|---|---|
committer | Melanie | 2011-12-05 20:32:35 +0000 |
commit | bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch) | |
tree | d0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Server | |
parent | Add the proper result code as per the LL announcement for llTransferLindenDol... (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2 opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Server')
22 files changed, 29 insertions, 29 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs index 8014fb5..0cfe5b1 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerDeleteHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
57 | } | 57 | } |
58 | 58 | ||
59 | public override byte[] Handle(string path, Stream request, | 59 | public override byte[] Handle(string path, Stream request, |
60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | bool result = false; | 62 | bool result = false; |
63 | 63 | ||
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs index 43c1693..8f7412b 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerGetHandler.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
55 | } | 55 | } |
56 | 56 | ||
57 | public override byte[] Handle(string path, Stream request, | 57 | public override byte[] Handle(string path, Stream request, |
58 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
59 | { | 59 | { |
60 | byte[] result = new byte[0]; | 60 | byte[] result = new byte[0]; |
61 | 61 | ||
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs index 1fcd3ed..87b3d2d 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerPostHandler.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
55 | } | 55 | } |
56 | 56 | ||
57 | public override byte[] Handle(string path, Stream request, | 57 | public override byte[] Handle(string path, Stream request, |
58 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
59 | { | 59 | { |
60 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); | 60 | XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); |
61 | AssetBase asset = (AssetBase) xs.Deserialize(request); | 61 | AssetBase asset = (AssetBase) xs.Deserialize(request); |
diff --git a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs index 4d1b0ff..a19b599 100644 --- a/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/AuthenticationServerPostHandler.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Server.Handlers.Authentication | |||
71 | } | 71 | } |
72 | 72 | ||
73 | public override byte[] Handle(string path, Stream request, | 73 | public override byte[] Handle(string path, Stream request, |
74 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 74 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
75 | { | 75 | { |
76 | string[] p = SplitParams(path); | 76 | string[] p = SplitParams(path); |
77 | 77 | ||
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs index e73961b..440b898 100644 --- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs | |||
@@ -219,7 +219,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>. | |||
219 | /// Handles all GET and POST requests for OpenID identifier pages and endpoint | 219 | /// Handles all GET and POST requests for OpenID identifier pages and endpoint |
220 | /// server communication | 220 | /// server communication |
221 | /// </summary> | 221 | /// </summary> |
222 | public void Handle(string path, Stream request, Stream response, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 222 | public void Handle(string path, Stream request, Stream response, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
223 | { | 223 | { |
224 | Uri providerEndpoint = new Uri(String.Format("{0}://{1}{2}", httpRequest.Url.Scheme, httpRequest.Url.Authority, httpRequest.Url.AbsolutePath)); | 224 | Uri providerEndpoint = new Uri(String.Format("{0}://{1}{2}", httpRequest.Url.Scheme, httpRequest.Url.Authority, httpRequest.Url.AbsolutePath)); |
225 | 225 | ||
diff --git a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs index d656238..bcf9d47 100644 --- a/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Authorization/AuthorizationServerPostHandler.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Server.Handlers.Authorization | |||
55 | } | 55 | } |
56 | 56 | ||
57 | public override byte[] Handle(string path, Stream request, | 57 | public override byte[] Handle(string path, Stream request, |
58 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 58 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
59 | { | 59 | { |
60 | XmlSerializer xs = new XmlSerializer(typeof (AuthorizationRequest)); | 60 | XmlSerializer xs = new XmlSerializer(typeof (AuthorizationRequest)); |
61 | AuthorizationRequest Authorization = (AuthorizationRequest) xs.Deserialize(request); | 61 | AuthorizationRequest Authorization = (AuthorizationRequest) xs.Deserialize(request); |
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs index 49c2e43..3ee405c 100644 --- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Avatar | |||
57 | } | 57 | } |
58 | 58 | ||
59 | public override byte[] Handle(string path, Stream requestData, | 59 | public override byte[] Handle(string path, Stream requestData, |
60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | StreamReader sr = new StreamReader(requestData); | 62 | StreamReader sr = new StreamReader(requestData); |
63 | string body = sr.ReadToEnd(); | 63 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Base/Utils.cs b/OpenSim/Server/Handlers/Base/Utils.cs index 92372a0..48d923f 100644 --- a/OpenSim/Server/Handlers/Base/Utils.cs +++ b/OpenSim/Server/Handlers/Base/Utils.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Server.Handlers.Base | |||
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | ||
73 | public static bool GetAuthentication(OSHttpRequest httpRequest, out string authority, out string authKey) | 73 | public static bool GetAuthentication(IOSHttpRequest httpRequest, out string authority, out string authKey) |
74 | { | 74 | { |
75 | authority = string.Empty; | 75 | authority = string.Empty; |
76 | authKey = string.Empty; | 76 | authKey = string.Empty; |
diff --git a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs index fc97d8c..59420f5 100644 --- a/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Server.Handlers.Friends | |||
58 | } | 58 | } |
59 | 59 | ||
60 | public override byte[] Handle(string path, Stream requestData, | 60 | public override byte[] Handle(string path, Stream requestData, |
61 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 61 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
62 | { | 62 | { |
63 | StreamReader sr = new StreamReader(requestData); | 63 | StreamReader sr = new StreamReader(requestData); |
64 | string body = sr.ReadToEnd(); | 64 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index afe2f27..645a77f 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
@@ -129,7 +129,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
129 | } | 129 | } |
130 | 130 | ||
131 | public string RestGetGridInfoMethod(string request, string path, string param, | 131 | public string RestGetGridInfoMethod(string request, string path, string param, |
132 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 132 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
133 | { | 133 | { |
134 | StringBuilder sb = new StringBuilder(); | 134 | StringBuilder sb = new StringBuilder(); |
135 | 135 | ||
diff --git a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs index edc0561..bebf482 100644 --- a/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs | |||
@@ -58,7 +58,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
58 | } | 58 | } |
59 | 59 | ||
60 | public override byte[] Handle(string path, Stream requestData, | 60 | public override byte[] Handle(string path, Stream requestData, |
61 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 61 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
62 | { | 62 | { |
63 | StreamReader sr = new StreamReader(requestData); | 63 | StreamReader sr = new StreamReader(requestData); |
64 | string body = sr.ReadToEnd(); | 64 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs index 485bc3e..4c0d52e 100644 --- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs +++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.GridUser | |||
57 | } | 57 | } |
58 | 58 | ||
59 | public override byte[] Handle(string path, Stream requestData, | 59 | public override byte[] Handle(string path, Stream requestData, |
60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | StreamReader sr = new StreamReader(requestData); | 62 | StreamReader sr = new StreamReader(requestData); |
63 | string body = sr.ReadToEnd(); | 63 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs index 56f130e..661507e 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs | |||
@@ -61,7 +61,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
61 | } | 61 | } |
62 | 62 | ||
63 | public override byte[] Handle(string path, Stream requestData, | 63 | public override byte[] Handle(string path, Stream requestData, |
64 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 64 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
65 | { | 65 | { |
66 | StreamReader sr = new StreamReader(requestData); | 66 | StreamReader sr = new StreamReader(requestData); |
67 | string body = sr.ReadToEnd(); | 67 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs index 4accea1..f306b1c 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HeloServerConnector.cs | |||
@@ -63,12 +63,12 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
63 | } | 63 | } |
64 | 64 | ||
65 | public override byte[] Handle(string path, Stream requestData, | 65 | public override byte[] Handle(string path, Stream requestData, |
66 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 66 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
67 | { | 67 | { |
68 | return OKResponse(httpResponse); | 68 | return OKResponse(httpResponse); |
69 | } | 69 | } |
70 | 70 | ||
71 | private byte[] OKResponse(OSHttpResponse httpResponse) | 71 | private byte[] OKResponse(IOSHttpResponse httpResponse) |
72 | { | 72 | { |
73 | m_log.Debug("[HELO]: hi, GET was called"); | 73 | m_log.Debug("[HELO]: hi, GET was called"); |
74 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); | 74 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); |
@@ -92,12 +92,12 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
92 | } | 92 | } |
93 | 93 | ||
94 | public override byte[] Handle(string path, Stream requestData, | 94 | public override byte[] Handle(string path, Stream requestData, |
95 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 95 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
96 | { | 96 | { |
97 | return OKResponse(httpResponse); | 97 | return OKResponse(httpResponse); |
98 | } | 98 | } |
99 | 99 | ||
100 | private byte[] OKResponse(OSHttpResponse httpResponse) | 100 | private byte[] OKResponse(IOSHttpResponse httpResponse) |
101 | { | 101 | { |
102 | m_log.Debug("[HELO]: hi, HEAD was called"); | 102 | m_log.Debug("[HELO]: hi, HEAD was called"); |
103 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); | 103 | httpResponse.AddHeader("X-Handlers-Provided", m_HandlersType); |
diff --git a/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs index 850bf14..231e32f 100644 --- a/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs +++ b/OpenSim/Server/Handlers/Inventory/InventoryServerMoveItemsHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Inventory | |||
57 | } | 57 | } |
58 | 58 | ||
59 | public override byte[] Handle(string path, Stream request, | 59 | public override byte[] Handle(string path, Stream request, |
60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>)); | 62 | XmlSerializer xs = new XmlSerializer(typeof (List<InventoryItemBase>)); |
63 | List<InventoryItemBase> items = (List<InventoryItemBase>)xs.Deserialize(request); | 63 | List<InventoryItemBase> items = (List<InventoryItemBase>)xs.Deserialize(request); |
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs index 899f9c0..9d6f964 100644 --- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs +++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Server.Handlers.Asset | |||
88 | } | 88 | } |
89 | 89 | ||
90 | public override byte[] Handle(string path, Stream requestData, | 90 | public override byte[] Handle(string path, Stream requestData, |
91 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 91 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
92 | { | 92 | { |
93 | StreamReader sr = new StreamReader(requestData); | 93 | StreamReader sr = new StreamReader(requestData); |
94 | string body = sr.ReadToEnd(); | 94 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs index 8291107..75dd711 100644 --- a/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapAddServerConnector.cs | |||
@@ -77,7 +77,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
77 | m_MapService = service; | 77 | m_MapService = service; |
78 | } | 78 | } |
79 | 79 | ||
80 | public override byte[] Handle(string path, Stream requestData, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 80 | public override byte[] Handle(string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
81 | { | 81 | { |
82 | // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); | 82 | // m_log.DebugFormat("[MAP SERVICE IMAGE HANDLER]: Received {0}", path); |
83 | StreamReader sr = new StreamReader(requestData); | 83 | StreamReader sr = new StreamReader(requestData); |
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs index 501074d..fb85d1c 100644 --- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs +++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs | |||
@@ -80,7 +80,7 @@ namespace OpenSim.Server.Handlers.MapImage | |||
80 | m_MapService = service; | 80 | m_MapService = service; |
81 | } | 81 | } |
82 | 82 | ||
83 | public override byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 83 | public override byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
84 | { | 84 | { |
85 | byte[] result = new byte[0]; | 85 | byte[] result = new byte[0]; |
86 | 86 | ||
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs index 68bb01e..8a1f824 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
59 | } | 59 | } |
60 | 60 | ||
61 | public override byte[] Handle(string path, Stream request, | 61 | public override byte[] Handle(string path, Stream request, |
62 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 62 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
63 | { | 63 | { |
64 | // Not implemented yet | 64 | // Not implemented yet |
65 | Console.WriteLine("--- Get region --- " + path); | 65 | Console.WriteLine("--- Get region --- " + path); |
@@ -84,7 +84,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
84 | } | 84 | } |
85 | 85 | ||
86 | public override byte[] Handle(string path, Stream request, | 86 | public override byte[] Handle(string path, Stream request, |
87 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 87 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
88 | { | 88 | { |
89 | byte[] result = new byte[0]; | 89 | byte[] result = new byte[0]; |
90 | 90 | ||
@@ -177,7 +177,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
177 | } | 177 | } |
178 | 178 | ||
179 | public override byte[] Handle(string path, Stream request, | 179 | public override byte[] Handle(string path, Stream request, |
180 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 180 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
181 | { | 181 | { |
182 | // Not implemented yet | 182 | // Not implemented yet |
183 | httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; | 183 | httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; |
@@ -198,7 +198,7 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
198 | } | 198 | } |
199 | 199 | ||
200 | public override byte[] Handle(string path, Stream request, | 200 | public override byte[] Handle(string path, Stream request, |
201 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 201 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
202 | { | 202 | { |
203 | // Not implemented yet | 203 | // Not implemented yet |
204 | httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; | 204 | httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented; |
diff --git a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs index 85bf96e..6b6a552 100644 --- a/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Presence/PresenceServerPostHandler.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Server.Handlers.Presence | |||
57 | } | 57 | } |
58 | 58 | ||
59 | public override byte[] Handle(string path, Stream requestData, | 59 | public override byte[] Handle(string path, Stream requestData, |
60 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 60 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
61 | { | 61 | { |
62 | StreamReader sr = new StreamReader(requestData); | 62 | StreamReader sr = new StreamReader(requestData); |
63 | string body = sr.ReadToEnd(); | 63 | string body = sr.ReadToEnd(); |
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 78b09cd..ded335d5 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
@@ -272,7 +272,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
272 | } | 272 | } |
273 | 273 | ||
274 | public override byte[] Handle(string path, Stream request, | 274 | public override byte[] Handle(string path, Stream request, |
275 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 275 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
276 | { | 276 | { |
277 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); | 277 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); |
278 | 278 | ||
@@ -459,7 +459,7 @@ namespace OpenSim.Server.Handlers.Simulation | |||
459 | } | 459 | } |
460 | 460 | ||
461 | public override byte[] Handle(string path, Stream request, | 461 | public override byte[] Handle(string path, Stream request, |
462 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 462 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
463 | { | 463 | { |
464 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); | 464 | // m_log.DebugFormat("[SIMULATION]: Stream handler called"); |
465 | 465 | ||
diff --git a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs index 5ab4caf..ab383ef 100644 --- a/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs +++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerPostHandler.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Server.Handlers.UserAccounts | |||
69 | } | 69 | } |
70 | 70 | ||
71 | public override byte[] Handle(string path, Stream requestData, | 71 | public override byte[] Handle(string path, Stream requestData, |
72 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 72 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
73 | { | 73 | { |
74 | StreamReader sr = new StreamReader(requestData); | 74 | StreamReader sr = new StreamReader(requestData); |
75 | string body = sr.ReadToEnd(); | 75 | string body = sr.ReadToEnd(); |