diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs index febb491..cb76200 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | |||
| @@ -226,7 +226,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 226 | m_log.DebugFormat("[VivoxVoice] plugin initialization failed: {0}", e.ToString()); | 226 | m_log.DebugFormat("[VivoxVoice] plugin initialization failed: {0}", e.ToString()); |
| 227 | return; | 227 | return; |
| 228 | } | 228 | } |
| 229 | } | 229 | } |
| 230 | 230 | ||
| 231 | 231 | ||
| 232 | // Called to indicate that the module has been added to the region | 232 | // Called to indicate that the module has been added to the region |
| @@ -1144,7 +1144,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.VivoxVoice | |||
| 1144 | // Otherwise prepare the request | 1144 | // Otherwise prepare the request |
| 1145 | m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); | 1145 | m_log.DebugFormat("[VivoxVoice] Sending request <{0}>", requrl); |
| 1146 | 1146 | ||
| 1147 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); | 1147 | HttpWebRequest req = (HttpWebRequest)WebRequest.Create(requrl); |
| 1148 | HttpWebResponse rsp = null; | 1148 | HttpWebResponse rsp = null; |
| 1149 | 1149 | ||
| 1150 | // We are sending just parameters, no content | 1150 | // We are sending just parameters, no content |