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/Application/OpenSimBase.cs | |
| 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/Region/Application/OpenSimBase.cs')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 468c5d7..6e7a2a0 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -699,7 +699,7 @@ namespace OpenSim | |||
| 699 | public byte[] Handle(string path, Stream request, | 699 | public byte[] Handle(string path, Stream request, |
| 700 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 700 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
| 701 | { | 701 | { |
| 702 | return Encoding.UTF8.GetBytes("OK"); | 702 | return Util.UTF8.GetBytes("OK"); |
| 703 | } | 703 | } |
| 704 | 704 | ||
| 705 | public string ContentType | 705 | public string ContentType |
| @@ -736,7 +736,7 @@ namespace OpenSim | |||
| 736 | public byte[] Handle(string path, Stream request, | 736 | public byte[] Handle(string path, Stream request, |
| 737 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 737 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
| 738 | { | 738 | { |
| 739 | return Encoding.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); | 739 | return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); |
| 740 | } | 740 | } |
| 741 | 741 | ||
| 742 | public string ContentType | 742 | public string ContentType |
| @@ -777,7 +777,7 @@ namespace OpenSim | |||
| 777 | public byte[] Handle(string path, Stream request, | 777 | public byte[] Handle(string path, Stream request, |
| 778 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 778 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
| 779 | { | 779 | { |
| 780 | return Encoding.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); | 780 | return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); |
| 781 | } | 781 | } |
| 782 | 782 | ||
| 783 | public string ContentType | 783 | public string ContentType |