2 files changed, 60 insertions, 50 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
index 8af3652..7b20446 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -306,30 +306,35 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                agentID, caps, scene.RegionInfo.RegionName);
            string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("ProvisionVoiceAccountRequest",
+            caps.RegisterHandler(
-                                 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
+                "ProvisionVoiceAccountRequest",
-                                                       delegate(string request, string path, string param,
+                new RestStreamHandler(
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    "POST",
-                                                       {
+                    capsBase + m_provisionVoiceAccountRequestPath,
-                                                           return ProvisionVoiceAccountRequest(scene, request, path, param,
+                    (request, path, param, httpRequest, httpResponse)
-                                                                                               agentID, caps);
+                        => ProvisionVoiceAccountRequest(scene, request, path, param, agentID, caps),
-                                                       }));
+                    "ProvisionVoiceAccountRequest",
-            caps.RegisterHandler("ParcelVoiceInfoRequest",
+                    agentID.ToString()));
-                                 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
-                                                       delegate(string request, string path, string param,
+            caps.RegisterHandler(
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                "ParcelVoiceInfoRequest",
-                                                       {
+                new RestStreamHandler(
-                                                           return ParcelVoiceInfoRequest(scene, request, path, param,
+                    "POST",
-                                                                                         agentID, caps);
+                    capsBase + m_parcelVoiceInfoRequestPath,
-                                                       }));
+                        (request, path, param, httpRequest, httpResponse)
-            caps.RegisterHandler("ChatSessionRequest",
+                            => ParcelVoiceInfoRequest(scene, request, path, param, agentID, caps),
-                                 new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
+                    "ParcelVoiceInfoRequest",
-                                                       delegate(string request, string path, string param,
+                    agentID.ToString()));
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
-                                                       {
+            caps.RegisterHandler(
-                                                           return ChatSessionRequest(scene, request, path, param,
+                "ChatSessionRequest",
-                                                                                     agentID, caps);
+                new RestStreamHandler(
-                                                       }));
+                    "POST",
+                    capsBase + m_chatSessionRequestPath,
+                            (request, path, param, httpRequest, httpResponse)
+                                => ChatSessionRequest(scene, request, path, param, agentID, caps),
+                    "ChatSessionRequest",
+                    agentID.ToString()));
        }
        /// <summary>
@@ -818,11 +823,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
                m_log.DebugFormat("[FreeSwitchVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}",
                                  landName, land.LocalID, landUUID);
            }
-            System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
            // slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables
            // the personal speech indicators as well unless some siren14-3d codec magic happens. we dont have siren143d so we'll settle for the personal speech indicator.
-            channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm);
+            channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(Encoding.ASCII.GetBytes(landUUID)), m_freeSwitchRealm);
            lock (m_ParcelAddress)
            {
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 4dbac1d..396d4c5 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -406,30 +406,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
            m_log.DebugFormat("[VivoxVoice] OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
            string capsBase = "/CAPS/" + caps.CapsObjectPath;
-            caps.RegisterHandler("ProvisionVoiceAccountRequest",
-                                 new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,
+            caps.RegisterHandler(
-                                                       delegate(string request, string path, string param,
+                "ProvisionVoiceAccountRequest",
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                 new RestStreamHandler(
-                                                       {
+                    "POST",
-                                                           return ProvisionVoiceAccountRequest(scene, request, path, param,
+                    capsBase + m_provisionVoiceAccountRequestPath,
-                                                                                               agentID, caps);
+                    (request, path, param, httpRequest, httpResponse)
-                                                       }));
+                        => ProvisionVoiceAccountRequest(scene, request, path, param, agentID, caps),
-            caps.RegisterHandler("ParcelVoiceInfoRequest",
+                    "ProvisionVoiceAccountRequest",
-                                 new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,
+                    agentID.ToString()));
-                                                       delegate(string request, string path, string param,
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+            caps.RegisterHandler(
-                                                       {
+                "ParcelVoiceInfoRequest",
-                                                           return ParcelVoiceInfoRequest(scene, request, path, param,
+                 new RestStreamHandler(
-                                                                                         agentID, caps);
+                    "POST",
-                                                       }));
+                    capsBase + m_parcelVoiceInfoRequestPath,
-            caps.RegisterHandler("ChatSessionRequest",
+                    (request, path, param, httpRequest, httpResponse)
-                                 new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,
+                        => ParcelVoiceInfoRequest(scene, request, path, param, agentID, caps),
-                                                       delegate(string request, string path, string param,
+                    "ParcelVoiceInfoRequest",
-                                                                IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
+                    agentID.ToString()));
-                                                       {
-                                                           return ChatSessionRequest(scene, request, path, param,
+            caps.RegisterHandler(
-                                                                                     agentID, caps);
+                "ChatSessionRequest",
-                                                       }));
+                 new RestStreamHandler(
+                    "POST",
+                    capsBase + m_chatSessionRequestPath,
+                    (request, path, param, httpRequest, httpResponse)
+                        => ChatSessionRequest(scene, request, path, param, agentID, caps),
+                    "ChatSessionRequest",
+                    agentID.ToString()));
        }
        /// <summary>

diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 8af3652..7b20446 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
@@ -306,30 +306,35 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
306	agentID, caps, scene.RegionInfo.RegionName);	306	agentID, caps, scene.RegionInfo.RegionName);
307		307
308	string capsBase = "/CAPS/" + caps.CapsObjectPath;	308	string capsBase = "/CAPS/" + caps.CapsObjectPath;
309	caps.RegisterHandler("ProvisionVoiceAccountRequest",	309	caps.RegisterHandler(
310	new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,	310	"ProvisionVoiceAccountRequest",
311	delegate(string request, string path, string param,	311	new RestStreamHandler(
312	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	312	"POST",
313	{	313	capsBase + m_provisionVoiceAccountRequestPath,
314	return ProvisionVoiceAccountRequest(scene, request, path, param,	314	(request, path, param, httpRequest, httpResponse)
315	agentID, caps);	315	=> ProvisionVoiceAccountRequest(scene, request, path, param, agentID, caps),
316	}));	316	"ProvisionVoiceAccountRequest",
317	caps.RegisterHandler("ParcelVoiceInfoRequest",	317	agentID.ToString()));
318	new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,	318
319	delegate(string request, string path, string param,	319	caps.RegisterHandler(
320	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	320	"ParcelVoiceInfoRequest",
321	{	321	new RestStreamHandler(
322	return ParcelVoiceInfoRequest(scene, request, path, param,	322	"POST",
323	agentID, caps);	323	capsBase + m_parcelVoiceInfoRequestPath,
324	}));	324	(request, path, param, httpRequest, httpResponse)
325	caps.RegisterHandler("ChatSessionRequest",	325	=> ParcelVoiceInfoRequest(scene, request, path, param, agentID, caps),
326	new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,	326	"ParcelVoiceInfoRequest",
327	delegate(string request, string path, string param,	327	agentID.ToString()));
328	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	328
329	{	329	caps.RegisterHandler(
330	return ChatSessionRequest(scene, request, path, param,	330	"ChatSessionRequest",
331	agentID, caps);	331	new RestStreamHandler(
332	}));	332	"POST",
		333	capsBase + m_chatSessionRequestPath,
		334	(request, path, param, httpRequest, httpResponse)
		335	=> ChatSessionRequest(scene, request, path, param, agentID, caps),
		336	"ChatSessionRequest",
		337	agentID.ToString()));
333	}	338	}
334		339
335	/// <summary>	340	/// <summary>
@@ -818,11 +823,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
818	m_log.DebugFormat("[FreeSwitchVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}",	823	m_log.DebugFormat("[FreeSwitchVoice]: Region:Parcel \"{0}\": parcel id {1}: using channel name {2}",
819	landName, land.LocalID, landUUID);	824	landName, land.LocalID, landUUID);
820	}	825	}
821	System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
822		826
823	// slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables	827	// slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables
824	// the personal speech indicators as well unless some siren14-3d codec magic happens. we dont have siren143d so we'll settle for the personal speech indicator.	828	// the personal speech indicators as well unless some siren14-3d codec magic happens. we dont have siren143d so we'll settle for the personal speech indicator.
825	channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm);	829	channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(Encoding.ASCII.GetBytes(landUUID)), m_freeSwitchRealm);
826		830
827	lock (m_ParcelAddress)	831	lock (m_ParcelAddress)
828	{	832	{


diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 4dbac1d..396d4c5 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -406,30 +406,36 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
406	m_log.DebugFormat("[VivoxVoice] OnRegisterCaps: agentID {0} caps {1}", agentID, caps);	406	m_log.DebugFormat("[VivoxVoice] OnRegisterCaps: agentID {0} caps {1}", agentID, caps);
407		407
408	string capsBase = "/CAPS/" + caps.CapsObjectPath;	408	string capsBase = "/CAPS/" + caps.CapsObjectPath;
409	caps.RegisterHandler("ProvisionVoiceAccountRequest",	409
410	new RestStreamHandler("POST", capsBase + m_provisionVoiceAccountRequestPath,	410	caps.RegisterHandler(
411	delegate(string request, string path, string param,	411	"ProvisionVoiceAccountRequest",
412	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	412	new RestStreamHandler(
413	{	413	"POST",
414	return ProvisionVoiceAccountRequest(scene, request, path, param,	414	capsBase + m_provisionVoiceAccountRequestPath,
415	agentID, caps);	415	(request, path, param, httpRequest, httpResponse)
416	}));	416	=> ProvisionVoiceAccountRequest(scene, request, path, param, agentID, caps),
417	caps.RegisterHandler("ParcelVoiceInfoRequest",	417	"ProvisionVoiceAccountRequest",
418	new RestStreamHandler("POST", capsBase + m_parcelVoiceInfoRequestPath,	418	agentID.ToString()));
419	delegate(string request, string path, string param,	419
420	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	420	caps.RegisterHandler(
421	{	421	"ParcelVoiceInfoRequest",
422	return ParcelVoiceInfoRequest(scene, request, path, param,	422	new RestStreamHandler(
423	agentID, caps);	423	"POST",
424	}));	424	capsBase + m_parcelVoiceInfoRequestPath,
425	caps.RegisterHandler("ChatSessionRequest",	425	(request, path, param, httpRequest, httpResponse)
426	new RestStreamHandler("POST", capsBase + m_chatSessionRequestPath,	426	=> ParcelVoiceInfoRequest(scene, request, path, param, agentID, caps),
427	delegate(string request, string path, string param,	427	"ParcelVoiceInfoRequest",
428	IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)	428	agentID.ToString()));
429	{	429
430	return ChatSessionRequest(scene, request, path, param,	430	caps.RegisterHandler(
431	agentID, caps);	431	"ChatSessionRequest",
432	}));	432	new RestStreamHandler(
		433	"POST",
		434	capsBase + m_chatSessionRequestPath,
		435	(request, path, param, httpRequest, httpResponse)
		436	=> ChatSessionRequest(scene, request, path, param, agentID, caps),
		437	"ChatSessionRequest",
		438	agentID.ToString()));
433	}	439	}
434		440
435	/// <summary>	441	/// <summary>