* Added "svn load" command to correspond "svn save". Will grab the latest revision.

* TODO: Specific revision support.
0.6.0-stable
Adam Frisby 2008-04-17 14:26:19 +00:00
parent 200b60bd48
commit db9c919086
2 changed files with 13 additions and 1 deletions

View File

@ -1,7 +1,7 @@
using System; using System;
namespace OpenSim.Region.Environment.Modules.Terrain namespace OpenSim.Region.Environment.Modules.Terrain
{ {
interface ITerrainModule public interface ITerrainModule
{ {
void LoadFromFile(string filename); void LoadFromFile(string filename);
void SaveToFile(string filename); void SaveToFile(string filename);

View File

@ -50,6 +50,16 @@ namespace OpenSim.Region.Modules.SvnSerialiser
m_log.Info("[SVNBACKUP]: Backup successful."); m_log.Info("[SVNBACKUP]: Backup successful.");
} }
public void LoadRegion(Scene scene)
{
m_svnClient.Checkout2(m_svnurl, m_svndir, Svn.Revision.Head, Svn.Revision.Head, true, false);
scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() +
Slash.DirectorySeparatorChar + "objects.xml");
scene.RequestModuleInterface<OpenSim.Region.Environment.Modules.Terrain.ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID.ToString() +
Slash.DirectorySeparatorChar + "heightmap.r32");
m_log.Info("[SVNBACKUP]: Load successful.");
}
#endregion #endregion
#region SvnDotNet Callbacks #region SvnDotNet Callbacks
@ -114,6 +124,8 @@ namespace OpenSim.Region.Modules.SvnSerialiser
{ {
if (args[0] == "svn" && args[1] == "save") if (args[0] == "svn" && args[1] == "save")
SaveRegion(m_scenes[0]); SaveRegion(m_scenes[0]);
if (args[0] == "svn" && args[1] == "load")
LoadRegion(m_scenes[0]);
} }
public void PostInitialise() public void PostInitialise()