aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-05-09 23:12:30 +0100
committerJustin Clark-Casey (justincc)2012-05-09 23:12:30 +0100
commit6987aef38dbc4f5c24b6e2cc73601f9a7c5f4431 (patch)
tree2d89a7bf9e4b4b1d54fd6594742d9dc6ed8845c3 /OpenSim/Region/ClientStack/Linden
parentEscape and unescape xml element names if necessary in ServerUtils.BuildXmlDat... (diff)
downloadopensim-SC_OLD-6987aef38dbc4f5c24b6e2cc73601f9a7c5f4431.zip
opensim-SC_OLD-6987aef38dbc4f5c24b6e2cc73601f9a7c5f4431.tar.gz
opensim-SC_OLD-6987aef38dbc4f5c24b6e2cc73601f9a7c5f4431.tar.bz2
opensim-SC_OLD-6987aef38dbc4f5c24b6e2cc73601f9a7c5f4431.tar.xz
Improve logging on the prim inventory script asset request path for future use.
This adds name and description of the request handler to http request logging when DebugLevel >= 1
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs2
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs13
2 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 9791885..6c28e78 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -309,7 +309,7 @@ namespace OpenSim.Region.ClientStack.Linden
309 309
310 m_HostCapsObj.HttpListener.AddStreamHandler( 310 m_HostCapsObj.HttpListener.AddStreamHandler(
311 new BinaryStreamHandler( 311 new BinaryStreamHandler(
312 "POST", capsBase + uploaderPath, uploader.uploaderCaps, "BunchOfCaps", null)); 312 "POST", capsBase + uploaderPath, uploader.uploaderCaps, "TaskInventoryScriptUpdater", null));
313 313
314 string protocol = "http://"; 314 string protocol = "http://";
315 315
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index ae5cbff..4d6081c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11955,21 +11955,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11955 protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID) 11955 protected void MakeAssetRequest(TransferRequestPacket transferRequest, UUID taskID)
11956 { 11956 {
11957 UUID requestID = UUID.Zero; 11957 UUID requestID = UUID.Zero;
11958 if (transferRequest.TransferInfo.SourceType == (int)SourceType.Asset) 11958 int sourceType = transferRequest.TransferInfo.SourceType;
11959
11960 if (sourceType == (int)SourceType.Asset)
11959 { 11961 {
11960 requestID = new UUID(transferRequest.TransferInfo.Params, 0); 11962 requestID = new UUID(transferRequest.TransferInfo.Params, 0);
11961 } 11963 }
11962 else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimInventoryItem) 11964 else if (sourceType == (int)SourceType.SimInventoryItem)
11963 { 11965 {
11964 requestID = new UUID(transferRequest.TransferInfo.Params, 80); 11966 requestID = new UUID(transferRequest.TransferInfo.Params, 80);
11965 } 11967 }
11966 else if (transferRequest.TransferInfo.SourceType == (int)SourceType.SimEstate) 11968 else if (sourceType == (int)SourceType.SimEstate)
11967 { 11969 {
11968 requestID = taskID; 11970 requestID = taskID;
11969 } 11971 }
11970 11972
11971 11973// m_log.DebugFormat(
11972// m_log.DebugFormat("[CLIENT]: {0} requesting asset {1}", Name, requestID); 11974// "[LLCLIENTVIEW]: Received transfer request for {0} in {1} type {2} by {3}",
11975// requestID, taskID, (SourceType)sourceType, Name);
11973 11976
11974 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived); 11977 m_assetService.Get(requestID.ToString(), transferRequest, AssetReceived);
11975 } 11978 }