diff options
Merge branch 'master' into bigmerge
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 3551d5d..817aa44 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")) |