From 0bec9f055105e323b46e87067e05ec10b1563bd5 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 15 Apr 2008 09:55:47 +0000
Subject: * Added support for serialising objects to ExportSerialisationModule
 via SerialiseObjects.cs * Cleaned up using tags on SerialiseTerrain.cs *
 Minor tweaks to ExportSerialisationModule.cs

---
 .../ExportSerialiser/ExportSerialisationModule.cs    |  3 ++-
 .../Modules/ExportSerialiser/SerialiseObjects.cs     | 20 ++++++++++++++++++++
 .../Modules/ExportSerialiser/SerialiseTerrain.cs     | 10 +---------
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs

diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
index 76f7249..adb607a 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/ExportSerialisationModule.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
             TextWriter regionInfoWriter = new StreamWriter(saveDir + "README.TXT");
             regionInfoWriter.WriteLine("Region Name: " + scene.RegionInfo.RegionName);
             regionInfoWriter.WriteLine("Region ID: " + scene.RegionInfo.RegionID.ToString());
-            regionInfoWriter.WriteLine("Backup Time: " + Util.UnixTimeSinceEpoch().ToString());
+            regionInfoWriter.WriteLine("Backup Time: UTC " + DateTime.UtcNow.ToString());
             regionInfoWriter.WriteLine("Serialise Version: 0.1");
             regionInfoWriter.Close();
 
@@ -117,6 +117,7 @@ namespace OpenSim.Region.Environment.Modules.ExportSerialiser
             lock (m_serialisers)
             {
                 m_serialisers.Add(new SerialiseTerrain());
+                m_serialisers.Add(new SerialiseObjects());
             }
 
             LoadCommanderCommands();
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
new file mode 100644
index 0000000..d8cae6e
--- /dev/null
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseObjects.cs
@@ -0,0 +1,20 @@
+using OpenSim.Region.Environment.Scenes;
+
+namespace OpenSim.Region.Environment.Modules.ExportSerialiser
+{
+    class SerialiseObjects : IFileSerialiser
+    {
+        #region IFileSerialiser Members
+
+        public string WriteToFile(Scene scene, string dir)
+        {
+            string targetFileName = dir + "objects.xml";
+
+            scene.SavePrimsToXml2(targetFileName);
+
+            return "objects.xml";
+        }
+
+        #endregion
+    }
+}
diff --git a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
index 2076490..0c79999 100644
--- a/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
+++ b/OpenSim/Region/Environment/Modules/ExportSerialiser/SerialiseTerrain.cs
@@ -1,13 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using libsecondlife;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Region.Environment.Interfaces;
+using OpenSim.Region.Environment.Modules.Terrain;
 using OpenSim.Region.Environment.Scenes;
-using OpenSim.Region.Environment.Modules.ModuleFramework;
-using OpenSim.Region.Environment.Modules.Terrain;
 
 namespace OpenSim.Region.Environment.Modules.ExportSerialiser
 {
-- 
cgit v1.1