aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs2
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 1b53a42..637beef 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
54 m_FriendsModule = fmodule; 54 m_FriendsModule = fmodule;
55 } 55 }
56 56
57 public override byte[] Handle(string path, Stream requestData, 57 public override byte[] Handle(
58 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 58 string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
59 { 59 {
60 StreamReader sr = new StreamReader(requestData); 60 StreamReader sr = new StreamReader(requestData);
61 string body = sr.ReadToEnd(); 61 string body = sr.ReadToEnd();
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 2117827..94bba83 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1421,7 +1421,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1421 caps.RegisterHandler("RemoteParcelRequest", 1421 caps.RegisterHandler("RemoteParcelRequest",
1422 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath, 1422 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,
1423 delegate(string request, string path, string param, 1423 delegate(string request, string path, string param,
1424 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 1424 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
1425 { 1425 {
1426 return RemoteParcelRequest(request, path, param, agentID, caps); 1426 return RemoteParcelRequest(request, path, param, agentID, caps);
1427 })); 1427 }));
@@ -1429,7 +1429,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1429 caps.RegisterHandler("ParcelPropertiesUpdate", 1429 caps.RegisterHandler("ParcelPropertiesUpdate",
1430 new RestStreamHandler("POST", "/CAPS/" + parcelCapID, 1430 new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
1431 delegate(string request, string path, string param, 1431 delegate(string request, string path, string param,
1432 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 1432 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
1433 { 1433 {
1434 return ProcessPropertiesUpdate(request, path, param, agentID, caps); 1434 return ProcessPropertiesUpdate(request, path, param, agentID, caps);
1435 })); 1435 }));
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
index 898ca4a..5239f50 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/MoapModule.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
293 /// <param name="httpResponse"></param> 293 /// <param name="httpResponse"></param>
294 /// <returns></returns> 294 /// <returns></returns>
295 protected string HandleObjectMediaMessage( 295 protected string HandleObjectMediaMessage(
296 string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 296 string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
297 { 297 {
298// m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request); 298// m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request);
299 299
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
474 /// <param name="httpResponse">/param> 474 /// <param name="httpResponse">/param>
475 /// <returns></returns> 475 /// <returns></returns>
476 protected string HandleObjectMediaNavigateMessage( 476 protected string HandleObjectMediaNavigateMessage(
477 string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse) 477 string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
478 { 478 {
479// m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request); 479// m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request);
480 480
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 95c727f..9b0e2ff 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
193 caps.RegisterHandler("MapLayer", 193 caps.RegisterHandler("MapLayer",
194 new RestStreamHandler("POST", capsBase + m_mapLayerPath, 194 new RestStreamHandler("POST", capsBase + m_mapLayerPath,
195 delegate(string request, string path, string param, 195 delegate(string request, string path, string param,
196 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 196 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
197 { 197 {
198 return MapLayerRequest(request, path, param, 198 return MapLayerRequest(request, path, param,
199 agentID, caps); 199 agentID, caps);