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

* Reload terrain from archive if there is one

0.6.0-stable
Justin Clarke Casey 2008-06-29 20:08:58 +00:00
parent f8d9ccc70e
commit d8e18ad0f0
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveReadRequest.cs
View File

@ -28,6 +28,7 @@
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.Environment.Modules.World.Serialiser; using OpenSim.Region.Environment.Modules.World.Serialiser;
using OpenSim.Region.Environment.Modules.World.Terrain;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -83,7 +84,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
// } // }
else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH)) else if (filePath.StartsWith(ArchiveConstants.ASSETS_PATH))
{ {
ResolveAssetData(filePath, data); LoadAsset(filePath, data);
}
else if (filePath.StartsWith(ArchiveConstants.TERRAINS_PATH))
{
LoadTerrain(filePath, data);
} }
} }
@ -105,12 +110,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
} }
/// <summary> /// <summary>
/// Resolve a new piece of asset data against stored metadata /// Load an asset
/// </summary> /// </summary>
/// <param name="assetFilename"></param> /// <param name="assetFilename"></param>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns>true if asset was successfully loaded, false otherwise</returns> /// <returns>true if asset was successfully loaded, false otherwise</returns>
protected bool ResolveAssetData(string assetPath, byte[] data) protected bool LoadAsset(string assetPath, byte[] data)
{ {
// Right now we're nastily obtaining the lluuid from the filename // Right now we're nastily obtaining the lluuid from the filename
string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length); string filename = assetPath.Remove(0, ArchiveConstants.ASSETS_PATH.Length);
@ -134,11 +139,32 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
else else
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[DEARCHIVER]: Tried to dearchive data with path {0} with an unknown type extension {1}", "[ARCHIVER]: Tried to dearchive data with path {0} with an unknown type extension {1}",
assetPath, extension); assetPath, extension);
return false; return false;
} }
} }
/// <summary>
/// Load terrain data
/// </summary>
/// <param name="terrainPath"></param>
/// <param name="data"></param>
/// <returns>
/// true if terrain was resolved successfully, false otherwise.
/// </returns>
protected bool LoadTerrain(string terrainPath, byte[] data)
{
ITerrainModule terrainModule = m_scene.RequestModuleInterface<ITerrainModule>();
MemoryStream ms = new MemoryStream(data);
terrainModule.LoadFromStream(terrainPath, ms);
ms.Close();
m_log.DebugFormat("[ARCHIVER]: Successfully loaded terrain {0}", terrainPath);
return true;
}
} }
} }