From f5feb25dd1d0e219310158cfaff4c752be7e2cda Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 10 Sep 2009 17:08:26 +0100 Subject: fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0 --- OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | 2 -- .../Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 2 +- OpenSim/Region/Framework/Scenes/Scene.cs | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 6585860..a394b1a 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs @@ -70,7 +70,6 @@ namespace OpenSim.Framework.AssetLoader.Filesystem long numBytes = fInfo.Length; if (fInfo.Exists) { - FileStream fStream = new FileStream(path, FileMode.Open, FileAccess.Read); byte[] idata = new byte[numBytes]; BinaryReader br = new BinaryReader(fStream); @@ -86,7 +85,6 @@ namespace OpenSim.Framework.AssetLoader.Filesystem } } - public void ForEachDefaultXmlAsset(string assetSetFilename, Action action) { List assets = new List(); diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 2a1c82e..0441215 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs @@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver destFolder = new InventoryFolderBase( newFolderId, newFolderName, m_userInfo.UserProfile.ID, - (short)AssetType.Folder, destFolder.ID, 0); + (short)AssetType.Folder, destFolder.ID, 1); m_scene.InventoryService.AddFolder(destFolder); // UUID newFolderId = UUID.Random(); diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index ecf0d80..5e27eff 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1293,7 +1293,6 @@ namespace OpenSim.Region.Framework.Scenes } catch (IOException e) { - m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); // Non standard region size. If there's an old terrain in the database, it might read past the buffer -- cgit v1.1