Added patch from Johan. First attempt to solve the LibSL.Packet GC problem. Works with LibSL rev>1532

2 files changed, 4 insertions, 4 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
                 LLUUID inv = inventoryItemID;
                 string res = "";
                 LLSDAssetUploadComplete uploadComplete = new LLSDAssetUploadComplete();
-                uploadComplete.new_asset = newAssetID.ToStringHyphenated();
+                uploadComplete.new_asset = newAssetID.ToString();
                 uploadComplete.new_inventory_item = inv;
                 uploadComplete.state = "complete";
 
@@ -489,7 +489,7 @@ namespace OpenSim.Region.Capabilities
                     assetID = OnUpLoad(inv, data);
                 }
 
-                uploadComplete.new_asset = assetID.ToStringHyphenated();
+                uploadComplete.new_asset = assetID.ToString();
                 uploadComplete.new_inventory_item = inv;
                 uploadComplete.state = "complete";
 
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSD.cs b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
index ea8ee9d..987d6e6 100644
--- a/OpenSim/Framework/Communications/Capabilities/LLSD.cs
+++ b/OpenSim/Framework/Communications/Capabilities/LLSD.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Capabilities
             {
                 LLUUID u = (LLUUID)obj;
                 writer.WriteStartElement(String.Empty, "uuid", String.Empty);
-                writer.WriteString(u.ToStringHyphenated());
+                writer.WriteString(u.ToString());
                 writer.WriteEndElement();
             }
             else if (obj is Hashtable)
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Capabilities
             }
             else if (obj is LLUUID)
             {
-                return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToStringHyphenated() + Environment.NewLine;
+                return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToString() + Environment.NewLine;
             }
             else if (obj is Hashtable)
             {