diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 5c596a1..150798b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs | |||
@@ -504,24 +504,19 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
504 | RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; | 504 | RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; |
505 | 505 | ||
506 | // Loaded metadata will empty if no information exists in the archive | 506 | // Loaded metadata will empty if no information exists in the archive |
507 | currentRegionSettings.LoadedCreationDate = ""; | 507 | currentRegionSettings.LoadedCreationDateTime = 0; |
508 | currentRegionSettings.LoadedCreationTime = ""; | ||
509 | currentRegionSettings.LoadedCreationID = ""; | 508 | currentRegionSettings.LoadedCreationID = ""; |
510 | 509 | ||
511 | while (xtr.Read()) | 510 | while (xtr.Read()) |
512 | { | 511 | { |
513 | if (xtr.NodeType == XmlNodeType.Element) | 512 | if (xtr.NodeType == XmlNodeType.Element) |
514 | { | 513 | { |
515 | if (xtr.Name.ToString() == "date") | 514 | if (xtr.Name.ToString() == "datetime") |
516 | { | 515 | { |
517 | // Disable date & time for now until load problem in | 516 | int value; |
518 | // http://opensimulator.org/mantis/view.php?id=3741 (note 0012120 by WWWench) is resolved | 517 | if (Int32.TryParse(xtr.ReadElementContentAsString(), out value)) |
519 | //currentRegionSettings.LoadedCreationDate = xtr.ReadElementContentAsString(); | 518 | currentRegionSettings.LoadedCreationDateTime = value; |
520 | } | 519 | } |
521 | else if (xtr.Name.ToString() == "time") | ||
522 | { | ||
523 | //currentRegionSettings.LoadedCreationTime = xtr.ReadElementContentAsString(); | ||
524 | } | ||
525 | else if (xtr.Name.ToString() == "id") | 520 | else if (xtr.Name.ToString() == "id") |
526 | { | 521 | { |
527 | currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString(); | 522 | currentRegionSettings.LoadedCreationID = xtr.ReadElementContentAsString(); |