minor: Remove some serialization module scene wrappers

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
 
         public void LoadRegion(Scene scene)
         {
-            scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
-                                    Slash.DirectorySeparatorChar + "objects.xml");
-            scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
-                                                                        Slash.DirectorySeparatorChar + "heightmap.r32");
-            m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");
+            IRegionSerialiserModule serialiser = scene.RequestModuleInterface<IRegionSerialiserModule>();
+            if (serialiser != null)   
+            {
+                serialiser.LoadPrimsFromXml2(
+                    scene,
+                    m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID 
+                        + Slash.DirectorySeparatorChar + "objects.xml");
+            
+                scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(
+                    m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID 
+                        + Slash.DirectorySeparatorChar + "heightmap.r32");
+            
+                m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");
+            }
+            else
+            {
+                m_log.ErrorFormat(
+                    "[SVNBACKUP]: Region load of {0} failed - no serialisation module available", 
+                    scene.RegionInfo.RegionName);
+            }
         }
 
         private void CheckoutSvn()