diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index 42efd67..4f1097e 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -563,7 +563,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
563 | 563 | ||
564 | public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request) | 564 | public Hashtable FreeSwitchSLVoiceGetPreloginHTTPHandler(Hashtable request) |
565 | { | 565 | { |
566 | m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceGetPreloginHTTPHandler called"); | 566 | // m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceGetPreloginHTTPHandler called"); |
567 | 567 | ||
568 | Hashtable response = new Hashtable(); | 568 | Hashtable response = new Hashtable(); |
569 | response["content_type"] = "text/xml"; | 569 | response["content_type"] = "text/xml"; |
@@ -714,7 +714,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
714 | 714 | ||
715 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) | 715 | public Hashtable FreeSwitchSLVoiceSigninHTTPHandler(Hashtable request) |
716 | { | 716 | { |
717 | m_log.Debug("[FreeSwitchVoice]: FreeSwitchSLVoiceSigninHTTPHandler called"); | 717 | //m_log.Debug("[FreeSwitchVoice] FreeSwitchSLVoiceSigninHTTPHandler called"); |
718 | // string requestbody = (string)request["body"]; | 718 | // string requestbody = (string)request["body"]; |
719 | // string uri = (string)request["uri"]; | 719 | // string uri = (string)request["uri"]; |
720 | // string contenttype = (string)request["content-type"]; | 720 | // string contenttype = (string)request["content-type"]; |
@@ -885,4 +885,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
885 | 885 | ||
886 | #endregion | 886 | #endregion |
887 | } | 887 | } |
888 | } \ No newline at end of file | 888 | } |
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index 534bf92..ae902eb 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
@@ -190,7 +190,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
190 | break; | 190 | break; |
191 | } | 191 | } |
192 | 192 | ||
193 | m_vivoxVoiceAccountApi = String.Format("http://{0}/api2", m_vivoxServer); | 193 | m_vivoxVoiceAccountApi = String.Format("https://{0}/api2", m_vivoxServer); |
194 | 194 | ||
195 | // Admin interface required values | 195 | // Admin interface required values |
196 | if (String.IsNullOrEmpty(m_vivoxServer) || | 196 | if (String.IsNullOrEmpty(m_vivoxServer) || |
@@ -749,7 +749,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
749 | } | 749 | } |
750 | 750 | ||
751 | 751 | ||
752 | private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; | 752 | private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; |
753 | 753 | ||
754 | /// <summary> | 754 | /// <summary> |
755 | /// Perform administrative login for Vivox. | 755 | /// Perform administrative login for Vivox. |
@@ -762,7 +762,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
762 | } | 762 | } |
763 | 763 | ||
764 | 764 | ||
765 | private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}"; | 765 | private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}"; |
766 | 766 | ||
767 | /// <summary> | 767 | /// <summary> |
768 | /// Perform administrative logout for Vivox. | 768 | /// Perform administrative logout for Vivox. |
@@ -774,7 +774,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
774 | } | 774 | } |
775 | 775 | ||
776 | 776 | ||
777 | private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; | 777 | private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; |
778 | 778 | ||
779 | /// <summary> | 779 | /// <summary> |
780 | /// Retrieve account information for the specified user. | 780 | /// Retrieve account information for the specified user. |
@@ -787,7 +787,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
787 | } | 787 | } |
788 | 788 | ||
789 | 789 | ||
790 | private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; | 790 | private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; |
791 | 791 | ||
792 | /// <summary> | 792 | /// <summary> |
793 | /// Creates a new account. | 793 | /// Creates a new account. |
@@ -802,7 +802,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
802 | } | 802 | } |
803 | 803 | ||
804 | 804 | ||
805 | private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; | 805 | private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; |
806 | 806 | ||
807 | /// <summary> | 807 | /// <summary> |
808 | /// Change the user's password. | 808 | /// Change the user's password. |
@@ -814,7 +814,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
814 | } | 814 | } |
815 | 815 | ||
816 | 816 | ||
817 | private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; | 817 | private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; |
818 | 818 | ||
819 | /// <summary> | 819 | /// <summary> |
820 | /// Create a channel. | 820 | /// Create a channel. |
@@ -888,7 +888,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
888 | return false; | 888 | return false; |
889 | } | 889 | } |
890 | 890 | ||
891 | private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; | 891 | private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; |
892 | 892 | ||
893 | /// <summary> | 893 | /// <summary> |
894 | /// Retrieve a channel. | 894 | /// Retrieve a channel. |
@@ -1032,7 +1032,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1032 | return false; | 1032 | return false; |
1033 | } | 1033 | } |
1034 | 1034 | ||
1035 | // private static readonly string m_vivoxChannelById = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; | 1035 | // private static readonly string m_vivoxChannelById = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; |
1036 | 1036 | ||
1037 | // private XmlElement VivoxGetChannelById(string parent, string channelid) | 1037 | // private XmlElement VivoxGetChannelById(string parent, string channelid) |
1038 | // { | 1038 | // { |
@@ -1056,7 +1056,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1056 | /// In this case the call handles parent and description as optional values. | 1056 | /// In this case the call handles parent and description as optional values. |
1057 | /// </summary> | 1057 | /// </summary> |
1058 | 1058 | ||
1059 | private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; | 1059 | private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; |
1060 | 1060 | ||
1061 | private XmlElement VivoxDeleteChannel(string parent, string channelid) | 1061 | private XmlElement VivoxDeleteChannel(string parent, string channelid) |
1062 | { | 1062 | { |
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
1072 | /// Return information on channels in the given directory | 1072 | /// Return information on channels in the given directory |
1073 | /// </summary> | 1073 | /// </summary> |
1074 | 1074 | ||
1075 | private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; | 1075 | private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; |
1076 | 1076 | ||
1077 | private XmlElement VivoxListChildren(string channelid) | 1077 | private XmlElement VivoxListChildren(string channelid) |
1078 | { | 1078 | { |