diff options
| author | Jeff Ames | 2007-12-20 05:43:02 +0000 |
|---|---|---|
| committer | Jeff Ames | 2007-12-20 05:43:02 +0000 |
| commit | be2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch) | |
| tree | 688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |
| parent | *Added event called after any movement is handled (OnClientMovement) - will b... (diff) | |
| download | opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2 opensim-SC-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.xz | |
Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532
Diffstat (limited to 'OpenSim/Framework/Communications/Cache/AssetTransactions.cs')
| -rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetTransactions.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs index 51b80e5..57c1fa6 100644 --- a/OpenSim/Framework/Communications/Cache/AssetTransactions.cs +++ b/OpenSim/Framework/Communications/Cache/AssetTransactions.cs | |||
| @@ -355,7 +355,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 355 | LLUUID inventoryItemID = this.inventoryItemID; | 355 | LLUUID inventoryItemID = this.inventoryItemID; |
| 356 | string text = ""; | 356 | string text = ""; |
| 357 | LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); | 357 | LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); |
| 358 | complete.new_asset = newAssetID.ToStringHyphenated(); | 358 | complete.new_asset = newAssetID.ToString(); |
| 359 | complete.new_inventory_item = inventoryItemID; | 359 | complete.new_inventory_item = inventoryItemID; |
| 360 | complete.state = "complete"; | 360 | complete.state = "complete"; |
| 361 | text = LLSDHelpers.SerialiseLLSDReply(complete); | 361 | text = LLSDHelpers.SerialiseLLSDReply(complete); |
| @@ -408,7 +408,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
| 408 | LLUUID inventoryItemID = this.inventoryItemID; | 408 | LLUUID inventoryItemID = this.inventoryItemID; |
| 409 | string text = ""; | 409 | string text = ""; |
| 410 | LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); | 410 | LLSDAssetUploadComplete complete = new LLSDAssetUploadComplete(); |
| 411 | complete.new_asset = newAssetID.ToStringHyphenated(); | 411 | complete.new_asset = newAssetID.ToString(); |
| 412 | complete.new_inventory_item = inventoryItemID; | 412 | complete.new_inventory_item = inventoryItemID; |
| 413 | complete.state = "complete"; | 413 | complete.state = "complete"; |
| 414 | text = LLSDHelpers.SerialiseLLSDReply(complete); | 414 | text = LLSDHelpers.SerialiseLLSDReply(complete); |