diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 14 |
2 files changed, 13 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs index 89071cd..ad2b7e4 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchDialplan.cs | |||
@@ -70,6 +70,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
70 | <action application=""conference"" data=""$1-${domain_name}@default""/> | 70 | <action application=""conference"" data=""$1-${domain_name}@default""/> |
71 | </condition> | 71 | </condition> |
72 | </extension> | 72 | </extension> |
73 | |||
74 | <extension name=""opensim_conf""> | ||
75 | <condition field=""destination_number"" expression=""^conf-(.*)$""> | ||
76 | <action application=""answer""/> | ||
77 | <action application=""conference"" data=""$1-${domain_name}@default""/> | ||
78 | </condition> | ||
79 | </extension> | ||
73 | 80 | ||
74 | <extension name=""avatar""> | 81 | <extension name=""avatar""> |
75 | <condition field=""destination_number"" expression=""^(x.*)$""> | 82 | <condition field=""destination_number"" expression=""^(x.*)$""> |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index ce68522..469ac2f 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -790,22 +790,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
790 | landName, land.LocalID, landUUID); | 790 | landName, land.LocalID, landUUID); |
791 | } | 791 | } |
792 | System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); | 792 | System.Text.ASCIIEncoding encoding = new System.Text.ASCIIEncoding(); |
793 | channelUri = String.Format("sip:confctl-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm); | ||
794 | 793 | ||
795 | //channelUri="sip:confctl-3001@9.20.151.43"; | 794 | // slvoice handles the sip address differently if it begins with confctl, hiding it from the user in the friends list. however it also disables |
796 | //channelUri="sip:opensimconf-3001@9.20.151.43"; | 795 | // 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. |
796 | channelUri = String.Format("sip:conf-{0}@{1}", "x" + Convert.ToBase64String(encoding.GetBytes(landUUID)), m_freeSwitchRealm); | ||
797 | |||
797 | 798 | ||
798 | return channelUri; | 799 | return channelUri; |
799 | } | 800 | } |
800 | 801 | ||
801 | private static bool CustomCertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error) | 802 | private static bool CustomCertificateValidation(object sender, X509Certificate cert, X509Chain chain, SslPolicyErrors error) |
802 | { | 803 | { |
803 | //if (cert.Subject == "E=root@lindenlab.com, CN=*.vaak.lindenlab.com, O=\"Linden Lab, Inc.\", L=San Francisco, S=California, C=US") | 804 | |
804 | //{ | ||
805 | return true; | 805 | return true; |
806 | //} | 806 | |
807 | |||
808 | //return false; | ||
809 | } | 807 | } |
810 | } | 808 | } |
811 | public class MonoCert : ICertificatePolicy | 809 | public class MonoCert : ICertificatePolicy |