diff options
author | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-11-22 22:05:26 -0500 |
commit | 94cb4b486a7c72841ccbcec403fc7b8c95c1249a (patch) | |
tree | 176ada6e4259c076ab6942b4c96538d868880281 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs | |
parent | * Adds a test for if the collision is at the bottom of the capsule on avatar.... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.zip opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.gz opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.bz2 opensim-SC_OLD-94cb4b486a7c72841ccbcec403fc7b8c95c1249a.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs index 247cee4..47b18d8 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs | |||
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
116 | return startFolder; | 116 | return startFolder; |
117 | 117 | ||
118 | string[] components = SplitEscapedPath(path); | 118 | string[] components = SplitEscapedPath(path); |
119 | components[0] = UnescapePath(components[0]); | 119 | components[0] = UnescapePath(components[0]); |
120 | 120 | ||
121 | //string[] components = path.Split(new string[] { PATH_DELIMITER.ToString() }, 2, StringSplitOptions.None); | 121 | //string[] components = path.Split(new string[] { PATH_DELIMITER.ToString() }, 2, StringSplitOptions.None); |
122 | 122 | ||
@@ -306,17 +306,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
306 | public static string EscapeArchivePath(string path) | 306 | public static string EscapeArchivePath(string path) |
307 | { | 307 | { |
308 | // Only encode ampersands (for escaping anything) and / (since this is used as general dir separator). | 308 | // Only encode ampersands (for escaping anything) and / (since this is used as general dir separator). |
309 | return path.Replace("&", "&").Replace("/", "/"); | 309 | return path.Replace("&", "&").Replace("/", "/"); |
310 | } | 310 | } |
311 | 311 | ||
312 | /// <summary> | 312 | /// <summary> |
313 | /// Unescape an archive path. | 313 | /// Unescape an archive path. |
314 | /// </summary> | 314 | /// </summary> |
315 | /// <param name="path"></param> | 315 | /// <param name="path"></param> |
316 | /// <returns></returns> | 316 | /// <returns></returns> |
317 | public static string UnescapeArchivePath(string path) | 317 | public static string UnescapeArchivePath(string path) |
318 | { | 318 | { |
319 | return path.Replace("/", "/").Replace("&", "&"); | 319 | return path.Replace("/", "/").Replace("&", "&"); |
320 | } | 320 | } |
321 | } | 321 | } |
322 | } \ No newline at end of file | 322 | } \ No newline at end of file |