diff options
| author | Justin Clark-Casey (justincc) | 2012-05-03 01:45:49 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-05-03 01:45:49 +0100 |
| commit | 231a3bf147315a9284140476d2b09e13c3fee1c0 (patch) | |
| tree | f04ffb5bb43d919c1687af57e4cb48829f6dc437 /OpenSim/Region/CoreModules/World/WorldMap | |
| parent | Comment out the five second sleep in etm.DoTeleport() if the old agent needs ... (diff) | |
| download | opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.zip opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.gz opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.bz2 opensim-SC_OLD-231a3bf147315a9284140476d2b09e13c3fee1c0.tar.xz | |
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
This is most useful for capabilities where the url is not self-describing.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index faaf928..2335bea 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -190,14 +190,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 190 | { | 190 | { |
| 191 | //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); | 191 | //m_log.DebugFormat("[WORLD MAP]: OnRegisterCaps: agentID {0} caps {1}", agentID, caps); |
| 192 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 192 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
| 193 | caps.RegisterHandler("MapLayer", | 193 | caps.RegisterHandler( |
| 194 | new RestStreamHandler("POST", capsBase + m_mapLayerPath, | 194 | "MapLayer", |
| 195 | delegate(string request, string path, string param, | 195 | new RestStreamHandler( |
| 196 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 196 | "POST", |
| 197 | { | 197 | capsBase + m_mapLayerPath, |
| 198 | return MapLayerRequest(request, path, param, | 198 | (request, path, param, httpRequest, httpResponse) |
| 199 | agentID, caps); | 199 | => MapLayerRequest(request, path, param, agentID, caps), |
| 200 | })); | 200 | "MapLayer", |
| 201 | agentID.ToString())); | ||
| 201 | } | 202 | } |
| 202 | 203 | ||
| 203 | /// <summary> | 204 | /// <summary> |