diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/LLSD.cs | 4 |
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 | |||
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 | ||
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 | |||
159 | { | 159 | { |
160 | LLUUID u = (LLUUID)obj; | 160 | LLUUID u = (LLUUID)obj; |
161 | writer.WriteStartElement(String.Empty, "uuid", String.Empty); | 161 | writer.WriteStartElement(String.Empty, "uuid", String.Empty); |
162 | writer.WriteString(u.ToStringHyphenated()); | 162 | writer.WriteString(u.ToString()); |
163 | writer.WriteEndElement(); | 163 | writer.WriteEndElement(); |
164 | } | 164 | } |
165 | else if (obj is Hashtable) | 165 | else if (obj is Hashtable) |
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Capabilities | |||
475 | } | 475 | } |
476 | else if (obj is LLUUID) | 476 | else if (obj is LLUUID) |
477 | { | 477 | { |
478 | return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToStringHyphenated() + Environment.NewLine; | 478 | return GetSpaces(indent) + "- uuid " + ((LLUUID)obj).ToString() + Environment.NewLine; |
479 | } | 479 | } |
480 | else if (obj is Hashtable) | 480 | else if (obj is Hashtable) |
481 | { | 481 | { |