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/Land | |
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/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index f6d4b40..8b7406d 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1433,21 +1433,26 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1433 | private void EventManagerOnRegisterCaps(UUID agentID, Caps caps) | 1433 | private void EventManagerOnRegisterCaps(UUID agentID, Caps caps) |
1434 | { | 1434 | { |
1435 | string capsBase = "/CAPS/" + caps.CapsObjectPath; | 1435 | string capsBase = "/CAPS/" + caps.CapsObjectPath; |
1436 | caps.RegisterHandler("RemoteParcelRequest", | 1436 | caps.RegisterHandler( |
1437 | new RestStreamHandler("POST", capsBase + remoteParcelRequestPath, | 1437 | "RemoteParcelRequest", |
1438 | delegate(string request, string path, string param, | 1438 | new RestStreamHandler( |
1439 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 1439 | "POST", |
1440 | { | 1440 | capsBase + remoteParcelRequestPath, |
1441 | return RemoteParcelRequest(request, path, param, agentID, caps); | 1441 | (request, path, param, httpRequest, httpResponse) |
1442 | })); | 1442 | => RemoteParcelRequest(request, path, param, agentID, caps), |
1443 | "RemoteParcelRequest", | ||
1444 | agentID.ToString())); | ||
1445 | |||
1443 | UUID parcelCapID = UUID.Random(); | 1446 | UUID parcelCapID = UUID.Random(); |
1444 | caps.RegisterHandler("ParcelPropertiesUpdate", | 1447 | caps.RegisterHandler( |
1445 | new RestStreamHandler("POST", "/CAPS/" + parcelCapID, | 1448 | "ParcelPropertiesUpdate", |
1446 | delegate(string request, string path, string param, | 1449 | new RestStreamHandler( |
1447 | IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 1450 | "POST", |
1448 | { | 1451 | "/CAPS/" + parcelCapID, |
1449 | return ProcessPropertiesUpdate(request, path, param, agentID, caps); | 1452 | (request, path, param, httpRequest, httpResponse) |
1450 | })); | 1453 | => ProcessPropertiesUpdate(request, path, param, agentID, caps), |
1454 | "ParcelPropertiesUpdate", | ||
1455 | agentID.ToString())); | ||
1451 | } | 1456 | } |
1452 | private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) | 1457 | private string ProcessPropertiesUpdate(string request, string path, string param, UUID agentID, Caps caps) |
1453 | { | 1458 | { |