OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

From: Rob Smart <SMARTROB@uk.ibm.com> 

Makes an avatars personal voice indicator work with Freeswitch (though not other avatars indicators)
0.6.6-post-fixes
Sean Dague 2009-06-19 12:21:33 +00:00
parent 1adeb8ad77
commit dfd4e78fc0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs
View File

@ -70,6 +70,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
<action application=""conference"" data=""$1-${domain_name}@default""/> <action application=""conference"" data=""$1-${domain_name}@default""/>
</condition> </condition>
</extension> </extension>
<extension name=""opensim_conf"">
<condition field=""destination_number"" expression=""^conf-(.*)$"">
<action application=""answer""/>
<action application=""conference"" data=""$1-${domain_name}@default""/>
</condition>
</extension>
<extension name=""avatar""> <extension name=""avatar"">
<condition field=""destination_number"" expression=""^(x.*)$""> <condition field=""destination_number"" expression=""^(x.*)$"">

14
OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs
View File

@ -790,22 +790,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice
landName, land.LocalID, landUUID); landName, land.LocalID, landUUID);
} }
System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding();
channelUri = String.Format("sip:confctl-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm);
//channelUri="sip:confctl-3001@9.20.151.43"; // slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables
//channelUri="sip:opensimconf-3001@9.20.151.43"; // 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);
return channelUri; return channelUri;
} }
private static bool CustomCertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error) private static bool CustomCertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error)
{ {
//if (cert.Subject == "E=root@lindenlab.com, CN=*.vaak.lindenlab.com, O=\"Linden Lab, Inc.\", L=San Francisco, S=California, C=US")
//{
return true; return true;
//}
//return false;
} }
} }
public class MonoCert : ICertificatePolicy public class MonoCert : ICertificatePolicy