diff options
author | Justin Clark-Casey (justincc) | 2009-09-10 17:08:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-10 17:08:26 +0100 |
commit | f5feb25dd1d0e219310158cfaff4c752be7e2cda (patch) | |
tree | e49fe0600a1d5f7c4708bc9046c5ae99216512f3 | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-f5feb25dd1d0e219310158cfaff4c752be7e2cda.zip opensim-SC_OLD-f5feb25dd1d0e219310158cfaff4c752be7e2cda.tar.gz opensim-SC_OLD-f5feb25dd1d0e219310158cfaff4c752be7e2cda.tar.bz2 opensim-SC_OLD-f5feb25dd1d0e219310158cfaff4c752be7e2cda.tar.xz |
fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0
3 files changed, 1 insertions, 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 | |||
70 | long numBytes = fInfo.Length; | 70 | long numBytes = fInfo.Length; |
71 | if (fInfo.Exists) | 71 | if (fInfo.Exists) |
72 | { | 72 | { |
73 | |||
74 | FileStream fStream = new FileStream(path, FileMode.Open, FileAccess.Read); | 73 | FileStream fStream = new FileStream(path, FileMode.Open, FileAccess.Read); |
75 | byte[] idata = new byte[numBytes]; | 74 | byte[] idata = new byte[numBytes]; |
76 | BinaryReader br = new BinaryReader(fStream); | 75 | BinaryReader br = new BinaryReader(fStream); |
@@ -86,7 +85,6 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
86 | } | 85 | } |
87 | } | 86 | } |
88 | 87 | ||
89 | |||
90 | public void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action) | 88 | public void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action) |
91 | { | 89 | { |
92 | List<AssetBase> assets = new List<AssetBase>(); | 90 | List<AssetBase> assets = new List<AssetBase>(); |
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 | |||
294 | destFolder | 294 | destFolder |
295 | = new InventoryFolderBase( | 295 | = new InventoryFolderBase( |
296 | newFolderId, newFolderName, m_userInfo.UserProfile.ID, | 296 | newFolderId, newFolderName, m_userInfo.UserProfile.ID, |
297 | (short)AssetType.Folder, destFolder.ID, 0); | 297 | (short)AssetType.Folder, destFolder.ID, 1); |
298 | m_scene.InventoryService.AddFolder(destFolder); | 298 | m_scene.InventoryService.AddFolder(destFolder); |
299 | 299 | ||
300 | // UUID newFolderId = UUID.Random(); | 300 | // 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 | |||
1293 | } | 1293 | } |
1294 | catch (IOException e) | 1294 | catch (IOException e) |
1295 | { | 1295 | { |
1296 | |||
1297 | m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); | 1296 | m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); |
1298 | 1297 | ||
1299 | // Non standard region size. If there's an old terrain in the database, it might read past the buffer | 1298 | // Non standard region size. If there's an old terrain in the database, it might read past the buffer |