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/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |
| 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 '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 7a3d97e..f0f3984 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
| @@ -106,12 +106,15 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 106 | UUID capID = UUID.Random(); | 106 | UUID capID = UUID.Random(); |
| 107 | 107 | ||
| 108 | // m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID); | 108 | // m_log.Debug("[UPLOAD OBJECT ASSET MODULE]: /CAPS/" + capID); |
| 109 | caps.RegisterHandler("UploadObjectAsset", | 109 | caps.RegisterHandler( |
| 110 | new RestHTTPHandler("POST", "/CAPS/OA/" + capID + "/", | 110 | "UploadObjectAsset", |
| 111 | delegate(Hashtable m_dhttpMethod) | 111 | new RestHTTPHandler( |
| 112 | { | 112 | "POST", |
| 113 | return ProcessAdd(m_dhttpMethod, agentID, caps); | 113 | "/CAPS/OA/" + capID + "/", |
| 114 | })); | 114 | httpMethod => ProcessAdd(httpMethod, agentID, caps), |
| 115 | "UploadObjectAsset", | ||
| 116 | agentID.ToString())); | ||
| 117 | |||
| 115 | /* | 118 | /* |
| 116 | caps.RegisterHandler("NewFileAgentInventoryVariablePrice", | 119 | caps.RegisterHandler("NewFileAgentInventoryVariablePrice", |
| 117 | 120 | ||