diff options
author | Melanie | 2009-10-05 10:17:23 +0100 |
---|---|---|
committer | Melanie | 2009-10-05 10:17:23 +0100 |
commit | 0744292b479446eb1ebec828afafacc0189709ca (patch) | |
tree | 3c43b5f425aff61d3625b75b7aef35ce5062ae56 /OpenSim/Region/OptionalModules/Avatar | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Make the asset connector async Get overload return false if the asset (diff) | |
download | opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.zip opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.gz opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.bz2 opensim-SC_OLD-0744292b479446eb1ebec828afafacc0189709ca.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs index c7bb56a..b04b076 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Voice/FreeSwitchVoice/FreeSwitchVoiceModule.cs | |||
@@ -559,7 +559,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
559 | 559 | ||
560 | if (method == "POST") | 560 | if (method == "POST") |
561 | { | 561 | { |
562 | byte[] contentreq = Encoding.UTF8.GetBytes(body); | 562 | byte[] contentreq = Util.UTF8.GetBytes(body); |
563 | forwardreq.ContentLength = contentreq.Length; | 563 | forwardreq.ContentLength = contentreq.Length; |
564 | Stream reqStream = forwardreq.GetRequestStream(); | 564 | Stream reqStream = forwardreq.GetRequestStream(); |
565 | reqStream.Write(contentreq, 0, contentreq.Length); | 565 | reqStream.Write(contentreq, 0, contentreq.Length); |
@@ -567,7 +567,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Voice.FreeSwitchVoice | |||
567 | } | 567 | } |
568 | 568 | ||
569 | HttpWebResponse fwdrsp = (HttpWebResponse)forwardreq.GetResponse(); | 569 | HttpWebResponse fwdrsp = (HttpWebResponse)forwardreq.GetResponse(); |
570 | Encoding encoding = Encoding.UTF8; | 570 | Encoding encoding = Util.UTF8; |
571 | StreamReader fwdresponsestream = new StreamReader(fwdrsp.GetResponseStream(), encoding); | 571 | StreamReader fwdresponsestream = new StreamReader(fwdrsp.GetResponseStream(), encoding); |
572 | fwdresponsestr = fwdresponsestream.ReadToEnd(); | 572 | fwdresponsestr = fwdresponsestream.ReadToEnd(); |
573 | fwdresponsecontenttype = fwdrsp.ContentType; | 573 | fwdresponsecontenttype = fwdrsp.ContentType; |