OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix spurious loading... messages on iar load by creating folders as version 1 rather than version 0

remotes/origin/0.6.7-post-fixes
Justin Clark-Casey (justincc) 2009-09-10 17:08:26 +01:00
parent 0cdec1fbc3
commit f5feb25dd1
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@ -70,7 +70,6 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
long numBytes = fInfo.Length; long numBytes = fInfo.Length;
if (fInfo.Exists) if (fInfo.Exists)
{ {
FileStream fStream = new FileStream(path, FileMode.Open, FileAccess.Read); FileStream fStream = new FileStream(path, FileMode.Open, FileAccess.Read);
byte[] idata = new byte[numBytes]; byte[] idata = new byte[numBytes];
BinaryReader br = new BinaryReader(fStream); BinaryReader br = new BinaryReader(fStream);
@ -86,7 +85,6 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
} }
} }
public void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action) public void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action)
{ {
List<AssetBase> assets = new List<AssetBase>(); List<AssetBase> assets = new List<AssetBase>();

2
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
destFolder destFolder
= new InventoryFolderBase( = new InventoryFolderBase(
newFolderId, newFolderName, m_userInfo.UserProfile.ID, newFolderId, newFolderName, m_userInfo.UserProfile.ID,
(short)AssetType.Folder, destFolder.ID, 0); (short)AssetType.Folder, destFolder.ID, 1);
m_scene.InventoryService.AddFolder(destFolder); m_scene.InventoryService.AddFolder(destFolder);
// UUID newFolderId = UUID.Random(); // UUID newFolderId = UUID.Random();

1
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1293,7 +1293,6 @@ namespace OpenSim.Region.Framework.Scenes
} }
catch (IOException e) catch (IOException e)
{ {
m_log.Warn("[TERRAIN]: Scene.cs: LoadWorldMap() - Failed with exception " + e.ToString() + " Regenerating"); 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 // Non standard region size. If there's an old terrain in the database, it might read past the buffer