diff options
| author | Melanie | 2011-12-05 20:32:35 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-05 20:32:35 +0000 |
| commit | bc17e2e9cf1361116f9082326f7630b8f0c862ba (patch) | |
| tree | d0bc568f8b5eeb47ccd77c822e6941b0e150319c /OpenSim/Region/Application | |
| parent | Add the proper result code as per the LL announcement for llTransferLindenDol... (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.zip opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.gz opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.bz2 opensim-SC-bc17e2e9cf1361116f9082326f7630b8f0c862ba.tar.xz | |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/Application')
| -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 8e1eb95..e8e4f19 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
| @@ -801,7 +801,7 @@ namespace OpenSim | |||
| 801 | public class SimStatusHandler : IStreamedRequestHandler | 801 | public class SimStatusHandler : IStreamedRequestHandler |
| 802 | { | 802 | { |
| 803 | public byte[] Handle(string path, Stream request, | 803 | public byte[] Handle(string path, Stream request, |
| 804 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 804 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 805 | { | 805 | { |
| 806 | return Util.UTF8.GetBytes("OK"); | 806 | return Util.UTF8.GetBytes("OK"); |
| 807 | } | 807 | } |
| @@ -838,7 +838,7 @@ namespace OpenSim | |||
| 838 | } | 838 | } |
| 839 | 839 | ||
| 840 | public byte[] Handle(string path, Stream request, | 840 | public byte[] Handle(string path, Stream request, |
| 841 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 841 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 842 | { | 842 | { |
| 843 | return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); | 843 | return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); |
| 844 | } | 844 | } |
| @@ -879,7 +879,7 @@ namespace OpenSim | |||
| 879 | } | 879 | } |
| 880 | 880 | ||
| 881 | public byte[] Handle(string path, Stream request, | 881 | public byte[] Handle(string path, Stream request, |
| 882 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 882 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
| 883 | { | 883 | { |
| 884 | return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); | 884 | return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); |
| 885 | } | 885 | } |