diff options
author | Jeff Ames | 2010-10-27 00:01:03 -0400 |
---|---|---|
committer | Jeff Ames | 2010-10-27 00:01:03 -0400 |
commit | a331fd4e24012a246bea9ac11689afe933e7968e (patch) | |
tree | 80979fb53e2531c434900390087f83f9a2a74254 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |
parent | * Updated libomv to r3461 (diff) | |
download | opensim-SC_OLD-a331fd4e24012a246bea9ac11689afe933e7968e.zip opensim-SC_OLD-a331fd4e24012a246bea9ac11689afe933e7968e.tar.gz opensim-SC_OLD-a331fd4e24012a246bea9ac11689afe933e7968e.tar.bz2 opensim-SC_OLD-a331fd4e24012a246bea9ac11689afe933e7968e.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 5500557..046b05f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
143 | if (filePath == ArchiveConstants.CONTROL_FILE_PATH) | 143 | if (filePath == ArchiveConstants.CONTROL_FILE_PATH) |
144 | { | 144 | { |
145 | LoadControlFile(filePath, data); | 145 | LoadControlFile(filePath, data); |
146 | } | 146 | } |
147 | else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) | 147 | else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) |
148 | { | 148 | { |
149 | if (LoadAsset(filePath, data)) | 149 | if (LoadAsset(filePath, data)) |
@@ -479,11 +479,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
479 | /// <param name="path"></param> | 479 | /// <param name="path"></param> |
480 | /// <param name="data"></param> | 480 | /// <param name="data"></param> |
481 | protected void LoadControlFile(string path, byte[] data) | 481 | protected void LoadControlFile(string path, byte[] data) |
482 | { | 482 | { |
483 | XDocument doc = XDocument.Parse(Encoding.ASCII.GetString(data)); | 483 | XDocument doc = XDocument.Parse(Encoding.ASCII.GetString(data)); |
484 | XElement archiveElement = doc.Element("archive"); | 484 | XElement archiveElement = doc.Element("archive"); |
485 | int majorVersion = int.Parse(archiveElement.Attribute("major_version").Value); | 485 | int majorVersion = int.Parse(archiveElement.Attribute("major_version").Value); |
486 | int minorVersion = int.Parse(archiveElement.Attribute("minor_version").Value); | 486 | int minorVersion = int.Parse(archiveElement.Attribute("minor_version").Value); |
487 | string version = string.Format("{0}.{1}", majorVersion, minorVersion); | 487 | string version = string.Format("{0}.{1}", majorVersion, minorVersion); |
488 | 488 | ||
489 | if (majorVersion > MAX_MAJOR_VERSION) | 489 | if (majorVersion > MAX_MAJOR_VERSION) |
@@ -492,7 +492,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
492 | string.Format( | 492 | string.Format( |
493 | "The IAR you are trying to load has major version number of {0} but this version of OpenSim can only load IARs with major version number {1} and below", | 493 | "The IAR you are trying to load has major version number of {0} but this version of OpenSim can only load IARs with major version number {1} and below", |
494 | majorVersion, MAX_MAJOR_VERSION)); | 494 | majorVersion, MAX_MAJOR_VERSION)); |
495 | } | 495 | } |
496 | 496 | ||
497 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Loading IAR with version {0}", version); | 497 | m_log.InfoFormat("[INVENTORY ARCHIVER]: Loading IAR with version {0}", version); |
498 | } | 498 | } |