aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-12-11 19:48:50 +0000
committerUbitUmarov2015-12-11 19:48:50 +0000
commit6ea43d60142b2f186a5d290c656da83e622bd69d (patch)
treed683caa353be89b0be171a67dd787238cb46753e /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
parentchange vivox url from https:// to http:// (merge issue) (diff)
downloadopensim-SC_OLD-6ea43d60142b2f186a5d290c656da83e622bd69d.zip
opensim-SC_OLD-6ea43d60142b2f186a5d290c656da83e622bd69d.tar.gz
opensim-SC_OLD-6ea43d60142b2f186a5d290c656da83e622bd69d.tar.bz2
opensim-SC_OLD-6ea43d60142b2f186a5d290c656da83e622bd69d.tar.xz
change vivox url from https:// to http:// missed several
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index e02ffa8..16a3780 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -761,7 +761,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
761 return VivoxCall(requrl, false); 761 return VivoxCall(requrl, false);
762 } 762 }
763 763
764 private static readonly string m_vivoxLogoutPath = "https://{0}/api2/viv_signout.php?auth_token={1}"; 764 private static readonly string m_vivoxLogoutPath = "http://{0}/api2/viv_signout.php?auth_token={1}";
765 765
766 /// <summary> 766 /// <summary>
767 /// Perform administrative logout for Vivox. 767 /// Perform administrative logout for Vivox.
@@ -773,7 +773,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
773 } 773 }
774 774
775 775
776 private static readonly string m_vivoxGetAccountPath = "https://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}"; 776 private static readonly string m_vivoxGetAccountPath = "http://{0}/api2/viv_get_acct.php?auth_token={1}&user_name={2}";
777 777
778 /// <summary> 778 /// <summary>
779 /// Retrieve account information for the specified user. 779 /// Retrieve account information for the specified user.
@@ -786,7 +786,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
786 } 786 }
787 787
788 788
789 private static readonly string m_vivoxNewAccountPath = "https://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}"; 789 private static readonly string m_vivoxNewAccountPath = "http://{0}/api2/viv_adm_acct_new.php?username={1}&pwd={2}&auth_token={3}";
790 790
791 /// <summary> 791 /// <summary>
792 /// Creates a new account. 792 /// Creates a new account.
@@ -801,7 +801,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
801 } 801 }
802 802
803 803
804 private static readonly string m_vivoxPasswordPath = "https://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}"; 804 private static readonly string m_vivoxPasswordPath = "http://{0}/api2/viv_adm_password.php?user_name={1}&new_pwd={2}&auth_token={3}";
805 805
806 /// <summary> 806 /// <summary>
807 /// Change the user's password. 807 /// Change the user's password.
@@ -813,7 +813,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
813 } 813 }
814 814
815 815
816 private static readonly string m_vivoxChannelPath = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}"; 816 private static readonly string m_vivoxChannelPath = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_name={2}&auth_token={3}";
817 817
818 /// <summary> 818 /// <summary>
819 /// Create a channel. 819 /// Create a channel.
@@ -885,7 +885,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
885 return false; 885 return false;
886 } 886 }
887 887
888 private static readonly string m_vivoxChannelSearchPath = "https://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}"; 888 private static readonly string m_vivoxChannelSearchPath = "http://{0}/api2/viv_chan_search.php?cond_channame={1}&auth_token={2}";
889 889
890 /// <summary> 890 /// <summary>
891 /// Retrieve a channel. 891 /// Retrieve a channel.
@@ -1040,7 +1040,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1040 // return VivoxCall(requrl, true); 1040 // return VivoxCall(requrl, true);
1041 // } 1041 // }
1042 1042
1043 private static readonly string m_vivoxChannelDel = "https://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}"; 1043 private static readonly string m_vivoxChannelDel = "http://{0}/api2/viv_chan_mod.php?mode={1}&chan_id={2}&auth_token={3}";
1044 1044
1045 /// <summary> 1045 /// <summary>
1046 /// Delete a channel. 1046 /// Delete a channel.
@@ -1064,7 +1064,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
1064 return VivoxCall(requrl, true); 1064 return VivoxCall(requrl, true);
1065 } 1065 }
1066 1066
1067 private static readonly string m_vivoxChannelSearch = "https://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}"; 1067 private static readonly string m_vivoxChannelSearch = "http://{0}/api2/viv_chan_search.php?&cond_chanparent={1}&auth_token={2}";
1068 1068
1069 /// <summary> 1069 /// <summary>
1070 /// Return information on channels in the given directory 1070 /// Return information on channels in the given directory