diff options
Diffstat (limited to 'OpenSim/Region/Modules')
| -rw-r--r-- | OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs index f90c697..ea389d6 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs | |||
| @@ -116,11 +116,26 @@ namespace OpenSim.Region.Modules.SvnSerialiser | |||
| 116 | 116 | ||
| 117 | public void LoadRegion(Scene scene) | 117 | public void LoadRegion(Scene scene) |
| 118 | { | 118 | { |
| 119 | scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + | 119 | IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>(); |
| 120 | Slash.DirectorySeparatorChar + "objects.xml"); | 120 | if (serialiser != null) |
| 121 | scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + | 121 | { |
| 122 | Slash.DirectorySeparatorChar + "heightmap.r32"); | 122 | serialiser.LoadPrimsFromXml2( |
| 123 | m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); | 123 | scene, |
| 124 | m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID | ||
| 125 | + Slash.DirectorySeparatorChar + "objects.xml"); | ||
| 126 | |||
| 127 | scene.RequestModuleInterface<ITerrainModule>().LoadFromFile( | ||
| 128 | m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID | ||
| 129 | + Slash.DirectorySeparatorChar + "heightmap.r32"); | ||
| 130 | |||
| 131 | m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); | ||
| 132 | } | ||
| 133 | else | ||
| 134 | { | ||
| 135 | m_log.ErrorFormat( | ||
| 136 | "[SVNBACKUP]: Region load of {0} failed - no serialisation module available", | ||
| 137 | scene.RegionInfo.RegionName); | ||
| 138 | } | ||
| 124 | } | 139 | } |
| 125 | 140 | ||
| 126 | private void CheckoutSvn() | 141 | private void CheckoutSvn() |