diff options
author | John Hurliman | 2009-11-05 23:50:42 -0800 |
---|---|---|
committer | John Hurliman | 2009-11-05 23:50:42 -0800 |
commit | dfe4dc735af35e644130cc804828c518c8368836 (patch) | |
tree | 95c8e02cf8be328bdb44b5177bca4bad725328a6 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |
parent | * Clamp the CoarseLocationUpdate packet at a maximum of 60 positions per pack... (diff) | |
parent | add unit test for iar & escaping (diff) | |
download | opensim-SC_OLD-dfe4dc735af35e644130cc804828c518c8368836.zip opensim-SC_OLD-dfe4dc735af35e644130cc804828c518c8368836.tar.gz opensim-SC_OLD-dfe4dc735af35e644130cc804828c518c8368836.tar.bz2 opensim-SC_OLD-dfe4dc735af35e644130cc804828c518c8368836.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs')
-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, |