diff options
Diffstat (limited to 'OpenSim')
4 files changed, 15 insertions, 8 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index d0463c8..401dfd3 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -447,8 +447,8 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
447 | { | 447 | { |
448 | if (DebugLevel >= 1) | 448 | if (DebugLevel >= 1) |
449 | m_log.DebugFormat( | 449 | m_log.DebugFormat( |
450 | "[BASE HTTP SERVER]: Found stream handler for {0} {1}", | 450 | "[BASE HTTP SERVER]: Found stream handler for {0} {1} {2} {3}", |
451 | request.HttpMethod, request.Url.PathAndQuery); | 451 | request.HttpMethod, request.Url.PathAndQuery, requestHandler.Name, requestHandler.Description); |
452 | 452 | ||
453 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. | 453 | // Okay, so this is bad, but should be considered temporary until everything is IStreamHandler. |
454 | byte[] buffer = null; | 454 | byte[] buffer = null; |
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 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 816d3b6..8a26df1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -300,6 +300,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
300 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId); | 300 | AssetBase asset = CreateAsset(item.Name, item.Description, (sbyte)AssetType.LSLText, data, remoteClient.AgentId); |
301 | AssetService.Store(asset); | 301 | AssetService.Store(asset); |
302 | 302 | ||
303 | // m_log.DebugFormat( | ||
304 | // "[PRIM INVENTORY]: Stored asset {0} when updating item {1} in prim {2} for {3}", | ||
305 | // asset.ID, item.Name, part.Name, remoteClient.Name); | ||
306 | |||
303 | if (isScriptRunning) | 307 | if (isScriptRunning) |
304 | { | 308 | { |
305 | part.Inventory.RemoveScriptInstance(item.ItemID, false); | 309 | part.Inventory.RemoveScriptInstance(item.ItemID, false); |