aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities/Caps.cs
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 05:43:02 +0000
committerJeff Ames2007-12-20 05:43:02 +0000
commitbe2ad79e52efb5eb543057e8e73fa601d0b91c87 (patch)
tree688a11b5737835b3cd46b2beaf01c6e9d23ace09 /OpenSim/Framework/Communications/Capabilities/Caps.cs
parent*Added event called after any movement is handled (OnClientMovement) - will b... (diff)
downloadopensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.zip
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.gz
opensim-SC_OLD-be2ad79e52efb5eb543057e8e73fa601d0b91c87.tar.bz2
opensim-SC_OLD-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/Capabilities/Caps.cs')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index e439ed8..eb678a0 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -421,7 +421,7 @@ namespace OpenSim.Region.Capabilities
421 LLUUID inv = inventoryItemID; 421 LLUUID inv = inventoryItemID;
422 string res = ""; 422 string res = "";
423 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete(); 423 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
424 uploadComplete.new_asset = newAssetID.ToStringHyphenated(); 424 uploadComplete.new_asset = newAssetID.ToString();
425 uploadComplete.new_inventory_item = inv; 425 uploadComplete.new_inventory_item = inv;
426 uploadComplete.state = "complete"; 426 uploadComplete.state = "complete";
427 427
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Capabilities
489 assetID = OnUpLoad(inv, data); 489 assetID = OnUpLoad(inv, data);
490 } 490 }
491 491
492 uploadComplete.new_asset = assetID.ToStringHyphenated(); 492 uploadComplete.new_asset = assetID.ToString();
493 uploadComplete.new_inventory_item = inv; 493 uploadComplete.new_inventory_item = inv;
494 uploadComplete.state = "complete"; 494 uploadComplete.state = "complete";
495 495