diff options
| author | BlueWall | 2011-12-07 07:52:24 -0500 |
|---|---|---|
| committer | BlueWall | 2011-12-07 07:52:24 -0500 |
| commit | 6ec59ee892c03ede9c83b5a0916f7fcfa5bbff13 (patch) | |
| tree | 6a71504761c3bfc1fedcf77d6c8467330e874fe1 /OpenSim/Framework/Servers/BaseOpenSimServer.cs | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| parent | Stop accidentally setting up the UploadTexture caps handler with the same url... (diff) | |
| download | opensim-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/Framework/Servers/BaseOpenSimServer.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index db063f1..4c381d0 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
| @@ -600,7 +600,7 @@ namespace OpenSim.Framework.Servers | |||
| 600 | 600 | ||
| 601 | } | 601 | } |
| 602 | 602 | ||
| 603 | public string StatReport(OSHttpRequest httpRequest) | 603 | public string StatReport(IOSHttpRequest httpRequest) |
| 604 | { | 604 | { |
| 605 | // If we catch a request for "callback", wrap the response in the value for jsonp | 605 | // If we catch a request for "callback", wrap the response in the value for jsonp |
| 606 | if (httpRequest.Query.ContainsKey("callback")) | 606 | if (httpRequest.Query.ContainsKey("callback")) |