aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2011-03-18 10:59:32 +0100
committerMelanie2011-03-18 10:59:32 +0100
commita8096b52cd28fbc18e115faa7fafd35899882673 (patch)
tree2b410de4510b8fd25eead49ed1f551de6e75360c /OpenSim/Region
parentPrevent god users from being stopped logging into a region (diff)
downloadopensim-SC_OLD-a8096b52cd28fbc18e115faa7fafd35899882673.zip
opensim-SC_OLD-a8096b52cd28fbc18e115faa7fafd35899882673.tar.gz
opensim-SC_OLD-a8096b52cd28fbc18e115faa7fafd35899882673.tar.bz2
opensim-SC_OLD-a8096b52cd28fbc18e115faa7fafd35899882673.tar.xz
Switch Vivox voice module to https
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs22
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index 34d0e24..5ba4033 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
196 break; 196 break;
197 } 197 }
198 198
199 m_vivoxVoiceAccountApi = String.Format("http://{0}/api2", m_vivoxServer); 199 m_vivoxVoiceAccountApi = String.Format("https://{0}/api2", m_vivoxServer);
200 200
201 // Admin interface required values 201 // Admin interface required values
202 if (String.IsNullOrEmpty(m_vivoxServer) || 202 if (String.IsNullOrEmpty(m_vivoxServer) ||
@@ -757,7 +757,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
757 } 757 }
758 758
759 759
760 private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}"; 760 private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
761 761
762 /// <summary> 762 /// <summary>
763 /// Perform administrative login for Vivox. 763 /// Perform administrative login for Vivox.
@@ -770,7 +770,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
770 } 770 }
771 771
772 772
773 private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}"; 773 private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}";
774 774
775 /// <summary> 775 /// <summary>
776 /// Perform administrative logout for Vivox. 776 /// Perform administrative logout for Vivox.
@@ -782,7 +782,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
782 } 782 }
783 783
784 784
785 private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; 785 private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}";
786 786
787 /// <summary> 787 /// <summary>
788 /// Retrieve account information for the specified user. 788 /// Retrieve account information for the specified user.
@@ -795,7 +795,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
795 } 795 }
796 796
797 797
798 private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; 798 private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}";
799 799
800 /// <summary> 800 /// <summary>
801 /// Creates a new account. 801 /// Creates a new account.
@@ -810,7 +810,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
810 } 810 }
811 811
812 812
813 private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; 813 private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}";
814 814
815 /// <summary> 815 /// <summary>
816 /// Change the user's password. 816 /// Change the user's password.
@@ -822,7 +822,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
822 } 822 }
823 823
824 824
825 private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; 825 private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}";
826 826
827 /// <summary> 827 /// <summary>
828 /// Create a channel. 828 /// Create a channel.
@@ -896,7 +896,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
896 return false; 896 return false;
897 } 897 }
898 898
899 private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; 899 private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}";
900 900
901 /// <summary> 901 /// <summary>
902 /// Retrieve a channel. 902 /// Retrieve a channel.
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1040 return false; 1040 return false;
1041 } 1041 }
1042 1042
1043 // private static readonly string m_vivoxChannelById = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1043 // private static readonly string m_vivoxChannelById = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1044 1044
1045 // private XmlElement VivoxGetChannelById(string parent, string channelid) 1045 // private XmlElement VivoxGetChannelById(string parent, string channelid)
1046 // { 1046 // {
@@ -1064,7 +1064,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1064 /// In this case the call handles parent and description as optional values. 1064 /// In this case the call handles parent and description as optional values.
1065 /// </summary> 1065 /// </summary>
1066 1066
1067 private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1067 private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1068 1068
1069 private XmlElement VivoxDeleteChannel(string parent, string channelid) 1069 private XmlElement VivoxDeleteChannel(string parent, string channelid)
1070 { 1070 {
@@ -1080,7 +1080,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1080 /// Return information on channels in the given directory 1080 /// Return information on channels in the given directory
1081 /// </summary> 1081 /// </summary>
1082 1082
1083 private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; 1083 private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}";
1084 1084
1085 private XmlElement VivoxListChildren(string channelid) 1085 private XmlElement VivoxListChildren(string channelid)
1086 { 1086 {