aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-12-11 19:44:42 +0000
committerUbitUmarov2015-12-11 19:44:42 +0000
commitb63a7d77054a887f191455839808c5bb2e2c2ad0 (patch)
tree4f76e010e81ee5fdfec7330a59a68ed1a4df03a0 /OpenSim
parentfix backup control flag, still a bad merge effect (diff)
downloadopensim-SC_OLD-b63a7d77054a887f191455839808c5bb2e2c2ad0.zip
opensim-SC_OLD-b63a7d77054a887f191455839808c5bb2e2c2ad0.tar.gz
opensim-SC_OLD-b63a7d77054a887f191455839808c5bb2e2c2ad0.tar.bz2
opensim-SC_OLD-b63a7d77054a887f191455839808c5bb2e2c2ad0.tar.xz
change vivox url from https:// to http:// (merge issue)
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
index f51527e..e02ffa8 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
@@ -749,8 +749,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice
749 return channelUri; 749 return channelUri;
750 } 750 }
751 751
752 752 private static readonly string m_vivoxLoginPath = "http://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
753 private static readonly string m_vivoxLoginPath = "https://{0}/api2/viv_signin.php?userid={1}&pwd={2}";
754 753
755 /// <summary> 754 /// <summary>
756 /// Perform administrative login for Vivox. 755 /// Perform administrative login for Vivox.