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/Framework/Communications/XMPP | |
| 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 'OpenSim/Framework/Communications/XMPP')
| -rw-r--r-- | OpenSim/Framework/Communications/XMPP/XmppWriter.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs index b52eda7..415d808 100644 --- a/OpenSim/Framework/Communications/XMPP/XmppWriter.cs +++ b/OpenSim/Framework/Communications/XMPP/XmppWriter.cs | |||
| @@ -38,7 +38,7 @@ namespace OpenSim.Framework.Communications.XMPP | |||
| 38 | { | 38 | { |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | public XMPPWriter(IOStream stream) : this(stream, Encoding.UTF8) | 41 | public XMPPWriter(IOStream stream) : this(stream, Util.UTF8) |
| 42 | { | 42 | { |
| 43 | } | 43 | } |
| 44 | 44 | ||