diff options
| author | Melanie | 2012-05-05 10:32:04 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-05 10:32:04 +0100 |
| commit | 31ab8b2fe0683cbc9fa4503c616722d678b66e33 (patch) | |
| tree | 34fefd4bf9db7eea797db49e75aaaac5080ea94b /OpenSim/Region/UserStatistics | |
| parent | Merge branch 'avination' (diff) | |
| parent | Fire the scripting changed event with CHANGED_OWNER when an object that has c... (diff) | |
| download | opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.zip opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.gz opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.bz2 opensim-SC-31ab8b2fe0683cbc9fa4503c616722d678b66e33.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/UserStatistics/WebStatsModule.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/UserStatistics/WebStatsModule.cs b/OpenSim/Region/UserStatistics/WebStatsModule.cs index 4248035..faf746f 100644 --- a/OpenSim/Region/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/UserStatistics/WebStatsModule.cs | |||
| @@ -282,14 +282,15 @@ namespace OpenSim.Region.UserStatistics | |||
| 282 | // m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); | 282 | // m_log.DebugFormat("[WEB STATS MODULE]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); |
| 283 | 283 | ||
| 284 | string capsPath = "/CAPS/VS/" + UUID.Random(); | 284 | string capsPath = "/CAPS/VS/" + UUID.Random(); |
| 285 | caps.RegisterHandler("ViewerStats", | 285 | caps.RegisterHandler( |
| 286 | new RestStreamHandler("POST", capsPath, | 286 | "ViewerStats", |
| 287 | delegate(string request, string path, string param, | 287 | new RestStreamHandler( |
| 288 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 288 | "POST", |
| 289 | { | 289 | capsPath, |
| 290 | return ViewerStatsReport(request, path, param, | 290 | (request, path, param, httpRequest, httpResponse) |
| 291 | agentID, caps); | 291 | => ViewerStatsReport(request, path, param, agentID, caps), |
| 292 | })); | 292 | "ViewerStats", |
| 293 | agentID.ToString())); | ||
| 293 | } | 294 | } |
| 294 | 295 | ||
| 295 | private void OnDeRegisterCaps(UUID agentID, Caps caps) | 296 | private void OnDeRegisterCaps(UUID agentID, Caps caps) |