Merge branch 'master' into bigmerge

author: Melanie 2011-12-05 20:32:35 +0000
committer: Melanie 2011-12-05 20:32:35 +0000
commit: bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch)
tree: d0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Region
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
12 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 8e1eb95..e8e4f19 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -801,7 +801,7 @@ namespace OpenSim
        public class SimStatusHandler : IStreamedRequestHandler
        {
            public byte[] Handle(string path, Stream request,
-                                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
            {
                return Util.UTF8.GetBytes("OK");
            }
@@ -838,7 +838,7 @@ namespace OpenSim
            }
            
            public byte[] Handle(string path, Stream request,
-                                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
            {
                return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
            }
@@ -879,7 +879,7 @@ namespace OpenSim
            }
            
            public byte[] Handle(string path, Stream request,
-                                 OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
            {
                return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
            }
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 98dda36..2347cf2 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Region.ClientStack.Linden
        /// <param name="httpResponse">HTTP response header object</param>
        /// <returns></returns>
        public string SeedCapRequest(string request, string path, string param,
-                                  OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                  IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
 //            m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
@@ -256,7 +256,7 @@ namespace OpenSim.Region.ClientStack.Linden
        /// <param name="httpResponse">HTTP response header object</param>
        /// <returns></returns>
        public string ScriptTaskInventory(string request, string path, string param,
-                                          OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                          IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            try
            {
@@ -685,7 +685,7 @@ namespace OpenSim.Region.ClientStack.Linden
        /// <param name="param"></param>
        /// <returns></returns>
        public string NoteCardAgentInventory(string request, string path, string param,
-                                             OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                             IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            //m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request);
            //m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request);
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
            m_FriendsModule = fmodule;
        }
-        public override byte[] Handle(string path, Stream requestData,
+        public override byte[] Handle(
-        OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+            string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            StreamReader sr = new StreamReader(requestData);
            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
            caps.RegisterHandler("RemoteParcelRequest",
                                 new RestStreamHandler("POST", capsBase + remoteParcelRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                           {
                                                               return RemoteParcelRequest(request, path, param, agentID, caps);
                                                           }));
@@ -1401,7 +1401,7 @@ namespace OpenSim.Region.CoreModules.World.Land
            caps.RegisterHandler("ParcelPropertiesUpdate",
                                 new RestStreamHandler("POST", "/CAPS/" + parcelCapID,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                           {
                                                               return ProcessPropertiesUpdate(request, path, param, agentID, caps);
                                                           }));
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
        /// <param name="httpResponse"></param>
        /// <returns></returns>
        protected string HandleObjectMediaMessage(
-            string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+            string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMedia path [{0}], raw request [{1}]", path, request);
         
@@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap
        /// <param name="httpResponse">/param>
        /// <returns></returns>
        protected string HandleObjectMediaNavigateMessage(
-            string request, string path, string param, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+            string request, string path, string param, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
 //            m_log.DebugFormat("[MOAP]: Got ObjectMediaNavigate request [{0}]", request);
            
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
            caps.RegisterHandler("MapLayer",
                                 new RestStreamHandler("POST", capsBase + m_mapLayerPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                           {
                                                               return MapLayerRequest(request, path, param,
                                                                                      agentID, caps);
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index a505999..b760454 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.DataSnapshot
        }
        public string OnDiscoveryAttempt(string request, string path, string param,
-                                         OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                         IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            //Very static for now, flexible enough to add new formats
            LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse();
diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index 4578236..6c5685c 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes
            osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
        }
                    
-        public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+        public byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            return Util.UTF8.GetBytes(Report());
        }
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 4f86e42..1b675a6 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
            caps.RegisterHandler("ProvisionVoiceAccountRequest",
                                 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ProvisionVoiceAccountRequest(scene, request, path, param,
                                                                                               agentID, caps);
@@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
            caps.RegisterHandler("ParcelVoiceInfoRequest",
                                 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ParcelVoiceInfoRequest(scene, request, path, param,
                                                                                         agentID, caps);
@@ -325,7 +325,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
            caps.RegisterHandler("ChatSessionRequest",
                                 new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ChatSessionRequest(scene, request, path, param,
                                                                                     agentID, caps);
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index ae902eb..0be0a19 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -421,7 +421,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
            caps.RegisterHandler("ProvisionVoiceAccountRequest",
                                 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ProvisionVoiceAccountRequest(scene, request, path, param,
                                                                                               agentID, caps);
@@ -429,7 +429,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
            caps.RegisterHandler("ParcelVoiceInfoRequest",
                                 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ParcelVoiceInfoRequest(scene, request, path, param,
                                                                                         agentID, caps);
@@ -437,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
            caps.RegisterHandler("ChatSessionRequest",
                                 new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ChatSessionRequest(scene, request, path, param,
                                                                                     agentID, caps);
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
index f47d9c7..550b5d4 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
        }
        public override byte[] Handle(string path, Stream requestData,
-                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
        {
            httpResponse.ContentType = "image/jpeg";
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs
index 0251ee8..fca9fd0 100644
--- a/OpenSim/Region/UserStatistics/WebStatsModule.cs
+++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Region.UserStatistics
            caps.RegisterHandler("ViewerStats",
                                 new RestStreamHandler("POST", capsPath,
                                                       delegate(string request, string path, string param,
-                                                                OSHttpRequest httpRequest, OSHttpResponse httpResponse)
+                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
                                                       {
                                                           return ViewerStatsReport(request, path, param,
                                                                                  agentID, caps);
author	Melanie	2011-12-05 20:32:35 +0000
committer	Melanie	2011-12-05 20:32:35 +0000
commit	bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch)
tree	d0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Region
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

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 8e1eb95..e8e4f19 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -801,7 +801,7 @@ namespace OpenSim
801	public class SimStatusHandler : IStreamedRequestHandler	801	public class SimStatusHandler : IStreamedRequestHandler
802	{	802	{
803	public byte[] Handle(string path, Stream request,	803	public byte[] Handle(string path, Stream request,
804	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	804	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
805	{	805	{
806	return Util.UTF8.GetBytes("OK");	806	return Util.UTF8.GetBytes("OK");
807	}	807	}
@@ -838,7 +838,7 @@ namespace OpenSim
838	}	838	}
839		839
840	public byte[] Handle(string path, Stream request,	840	public byte[] Handle(string path, Stream request,
841	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	841	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
842	{	842	{
843	return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));	843	return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
844	}	844	}
@@ -879,7 +879,7 @@ namespace OpenSim
879	}	879	}
880		880
881	public byte[] Handle(string path, Stream request,	881	public byte[] Handle(string path, Stream request,
882	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	882	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
883	{	883	{
884	return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));	884	return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
885	}	885	}


diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index 98dda36..2347cf2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Region.ClientStack.Linden
223	/// <param name="httpResponse">HTTP response header object</param>	223	/// <param name="httpResponse">HTTP response header object</param>
224	/// <returns></returns>	224	/// <returns></returns>
225	public string SeedCapRequest(string request, string path, string param,	225	public string SeedCapRequest(string request, string path, string param,
226	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	226	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
227	{	227	{
228	// m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);	228	// m_log.Debug("[CAPS]: Seed Caps Request in region: " + m_regionName);
229		229
@@ -256,7 +256,7 @@ namespace OpenSim.Region.ClientStack.Linden
256	/// <param name="httpResponse">HTTP response header object</param>	256	/// <param name="httpResponse">HTTP response header object</param>
257	/// <returns></returns>	257	/// <returns></returns>
258	public string ScriptTaskInventory(string request, string path, string param,	258	public string ScriptTaskInventory(string request, string path, string param,
259	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	259	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
260	{	260	{
261	try	261	try
262	{	262	{
@@ -685,7 +685,7 @@ namespace OpenSim.Region.ClientStack.Linden
685	/// <param name="param"></param>	685	/// <param name="param"></param>
686	/// <returns></returns>	686	/// <returns></returns>
687	public string NoteCardAgentInventory(string request, string path, string param,	687	public string NoteCardAgentInventory(string request, string path, string param,
688	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	688	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
689	{	689	{
690	//m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request);	690	//m_log.Debug("[CAPS]: NoteCardAgentInventory Request in region: " + m_regionName + "\n" + request);
691	//m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request);	691	//m_log.Debug("[CAPS]: NoteCardAgentInventory Request is: " + request);


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);


diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs index a505999..b760454 100644 --- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs +++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.DataSnapshot
74	}	74	}
75		75
76	public string OnDiscoveryAttempt(string request, string path, string param,	76	public string OnDiscoveryAttempt(string request, string path, string param,
77	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	77	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
78	{	78	{
79	//Very static for now, flexible enough to add new formats	79	//Very static for now, flexible enough to add new formats
80	LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse();	80	LLSDDiscoveryResponse llsd_response = new LLSDDiscoveryResponse();


diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs index 4578236..6c5685c 100644 --- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs +++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes
64	osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);	64	osXStatsURI = Util.SHA1Hash(regionInfo.osSecret);
65	}	65	}
66		66
67	public byte[] Handle(string path, Stream request, OSHttpRequest httpRequest, OSHttpResponse httpResponse)	67	public byte[] Handle(string path, Stream request, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
68	{	68	{
69	return Util.UTF8.GetBytes(Report());	69	return Util.UTF8.GetBytes(Report());
70	}	70	}


diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 4f86e42..1b675a6 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
309	caps.RegisterHandler("ProvisionVoiceAccountRequest",	309	caps.RegisterHandler("ProvisionVoiceAccountRequest",
310	new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,	310	new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
311	delegate(string request, string path, string param,	311	delegate(string request, string path, string param,
312	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	312	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
313	{	313	{
314	return ProvisionVoiceAccountRequest(scene, request, path, param,	314	return ProvisionVoiceAccountRequest(scene, request, path, param,
315	agentID, caps);	315	agentID, caps);
@@ -317,7 +317,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
317	caps.RegisterHandler("ParcelVoiceInfoRequest",	317	caps.RegisterHandler("ParcelVoiceInfoRequest",
318	new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,	318	new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
319	delegate(string request, string path, string param,	319	delegate(string request, string path, string param,
320	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	320	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
321	{	321	{
322	return ParcelVoiceInfoRequest(scene, request, path, param,	322	return ParcelVoiceInfoRequest(scene, request, path, param,
323	agentID, caps);	323	agentID, caps);
@@ -325,7 +325,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
325	caps.RegisterHandler("ChatSessionRequest",	325	caps.RegisterHandler("ChatSessionRequest",
326	new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,	326	new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
327	delegate(string request, string path, string param,	327	delegate(string request, string path, string param,
328	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	328	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
329	{	329	{
330	return ChatSessionRequest(scene, request, path, param,	330	return ChatSessionRequest(scene, request, path, param,
331	agentID, caps);	331	agentID, caps);


diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index ae902eb..0be0a19 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -421,7 +421,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
421	caps.RegisterHandler("ProvisionVoiceAccountRequest",	421	caps.RegisterHandler("ProvisionVoiceAccountRequest",
422	new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,	422	new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
423	delegate(string request, string path, string param,	423	delegate(string request, string path, string param,
424	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	424	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
425	{	425	{
426	return ProvisionVoiceAccountRequest(scene, request, path, param,	426	return ProvisionVoiceAccountRequest(scene, request, path, param,
427	agentID, caps);	427	agentID, caps);
@@ -429,7 +429,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
429	caps.RegisterHandler("ParcelVoiceInfoRequest",	429	caps.RegisterHandler("ParcelVoiceInfoRequest",
430	new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,	430	new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
431	delegate(string request, string path, string param,	431	delegate(string request, string path, string param,
432	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	432	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
433	{	433	{
434	return ParcelVoiceInfoRequest(scene, request, path, param,	434	return ParcelVoiceInfoRequest(scene, request, path, param,
435	agentID, caps);	435	agentID, caps);
@@ -437,7 +437,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
437	caps.RegisterHandler("ChatSessionRequest",	437	caps.RegisterHandler("ChatSessionRequest",
438	new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,	438	new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
439	delegate(string request, string path, string param,	439	delegate(string request, string path, string param,
440	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	440	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
441	{	441	{
442	return ChatSessionRequest(scene, request, path, param,	442	return ChatSessionRequest(scene, request, path, param,
443	agentID, caps);	443	agentID, caps);


diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs index f47d9c7..550b5d4 100644 --- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewRequestHandler.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
56	}	56	}
57		57
58	public override byte[] Handle(string path, Stream requestData,	58	public override byte[] Handle(string path, Stream requestData,
59	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	59	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
60	{	60	{
61	httpResponse.ContentType = "image/jpeg";	61	httpResponse.ContentType = "image/jpeg";
62		62


diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 0251ee8..fca9fd0 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Region.UserStatistics
306	caps.RegisterHandler("ViewerStats",	306	caps.RegisterHandler("ViewerStats",
307	new RestStreamHandler("POST", capsPath,	307	new RestStreamHandler("POST", capsPath,
308	delegate(string request, string path, string param,	308	delegate(string request, string path, string param,
309	OSHttpRequest httpRequest, OSHttpResponse httpResponse)	309	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
310	{	310	{
311	return ViewerStatsReport(request, path, param,	311	return ViewerStatsReport(request, path, param,
312	agentID, caps);	312	agentID, caps);