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 474905a..7a236bc 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -1393,7 +1393,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1393 caps.RegisterHandler("RemoteParcelRequest", 1393 caps.RegisterHandler("RemoteParcelRequest",
1394 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath, 1394 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,
1395 delegate(string request, string path, string param, 1395 delegate(string request, string path, string param,
1396 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 1396 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
1397 { 1397 {
1398 return RemoteParcelRequest(request, path, param, agentID, caps); 1398 return RemoteParcelRequest(request, path, param, agentID, caps);
1399 })); 1399 }));
@@ -1401,7 +1401,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1401 caps.RegisterHandler("ParcelPropertiesUpdate", 1401 caps.RegisterHandler("ParcelPropertiesUpdate",
1402 new RestStreamHandler("POST", "/CAPS/" + parcelCapID, 1402 new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
1403 delegate(string request, string path, string param, 1403 delegate(string request, string path, string param,
1404 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 1404 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
1405 { 1405 {
1406 return ProcessPropertiesUpdate(request, path, param, agentID, caps); 1406 return ProcessPropertiesUpdate(request, path, param, agentID, caps);
1407 })); 1407 }));
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 ba4ddc1..7118f16 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);