aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorBlueWall2011-12-07 07:52:24 -0500
committerBlueWall2011-12-07 07:52:24 -0500
commit6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch)
tree6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Region/Application/OpenSimBase.cs
parentMerge branch 'master' of /home/opensim/var/repo/opensim (diff)
parentStop accidentally setting up the UploadTexture caps handler with the same url... (diff)
downloadopensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.zip
opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.gz
opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.bz2
opensim-SC-6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 0a78df2..bae44ee 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -718,7 +718,7 @@ namespace OpenSim
718 public class SimStatusHandler : IStreamedRequestHandler 718 public class SimStatusHandler : IStreamedRequestHandler
719 { 719 {
720 public byte[] Handle(string path, Stream request, 720 public byte[] Handle(string path, Stream request,
721 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 721 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
722 { 722 {
723 return Util.UTF8.GetBytes("OK"); 723 return Util.UTF8.GetBytes("OK");
724 } 724 }
@@ -755,7 +755,7 @@ namespace OpenSim
755 } 755 }
756 756
757 public byte[] Handle(string path, Stream request, 757 public byte[] Handle(string path, Stream request,
758 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 758 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
759 { 759 {
760 return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); 760 return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
761 } 761 }
@@ -796,7 +796,7 @@ namespace OpenSim
796 } 796 }
797 797
798 public byte[] Handle(string path, Stream request, 798 public byte[] Handle(string path, Stream request,
799 OSHttpRequest httpRequest, OSHttpResponse httpResponse) 799 IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
800 { 800 {
801 return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest)); 801 return Util.UTF8.GetBytes(m_opensim.StatReport(httpRequest));
802 } 802 }