diff options
author | Justin Clark-Casey (justincc) | 2009-11-05 18:53:25 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-05 18:53:25 +0000 |
commit | 345ddcd0d82b15afa790ede4c1e8d93361a0d405 (patch) | |
tree | 69a8280f1ab48491937a2feca44e6b40bcdd83c4 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | Patch by revolution, thank you. Mantis #1789 . Implement friends permissions. (diff) | |
download | opensim-SC_OLD-345ddcd0d82b15afa790ede4c1e8d93361a0d405.zip opensim-SC_OLD-345ddcd0d82b15afa790ede4c1e8d93361a0d405.tar.gz opensim-SC_OLD-345ddcd0d82b15afa790ede4c1e8d93361a0d405.tar.bz2 opensim-SC_OLD-345ddcd0d82b15afa790ede4c1e8d93361a0d405.tar.xz |
* Escape / character when saving items and folders in an iar so that the loader doesn't barf
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 499c552..af0b72f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -394,6 +394,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
394 | /// <returns></returns> | 394 | /// <returns></returns> |
395 | public static string CreateArchiveFolderName(string name, UUID id) | 395 | public static string CreateArchiveFolderName(string name, UUID id) |
396 | { | 396 | { |
397 | // Only encode ampersands (for escaping anything) and / (since this is used as general dir separator). | ||
398 | name = name.Replace("&", "&"); | ||
399 | name = name.Replace("/", "/"); | ||
400 | |||
397 | return string.Format( | 401 | return string.Format( |
398 | "{0}{1}{2}/", | 402 | "{0}{1}{2}/", |
399 | name, | 403 | name, |
@@ -409,6 +413,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
409 | /// <returns></returns> | 413 | /// <returns></returns> |
410 | public static string CreateArchiveItemName(string name, UUID id) | 414 | public static string CreateArchiveItemName(string name, UUID id) |
411 | { | 415 | { |
416 | name = name.Replace("&", "&"); | ||
417 | name = name.Replace("/", "/"); | ||
418 | |||
412 | return string.Format( | 419 | return string.Format( |
413 | "{0}{1}{2}.xml", | 420 | "{0}{1}{2}.xml", |
414 | name, | 421 | name, |