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/OptionalModules/Avatar/Voice
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
2 files changed, 6 insertions, 6 deletions
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);
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/OptionalModules/Avatar/Voice
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/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);