Merge branch 'master' of /home/opensim/var/repo/opensim

author: BlueWall 2011-12-07 07:52:24 -0500
committer: BlueWall 2011-12-07 07:52:24 -0500
commit: 6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree: 6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parent: Merge branch 'master' of /home/opensim/var/repo/opensim (diff)
parent: Stop accidentally setting up the UploadTexture caps handler with the same url... (diff)
download: opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2
opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 534bf92..70e2f7e 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	BlueWall	2011-12-07 07:52:24 -0500
committer	BlueWall	2011-12-07 07:52:24 -0500
commit	6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree	6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parent	Merge branch 'master' of /home/opensim/var/repo/opensim (diff)
parent	Stop accidentally setting up the UploadTexture caps handler with the same url... (diff)
download	opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2 opensim-SC_OLD-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 534bf92..70e2f7e 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);