From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- .../Modules/World/Serialiser/IRegionSerialiser.cs | 12 ++++++------ .../Modules/World/Serialiser/SceneXmlLoader.cs | 15 +++++++-------- .../Modules/World/Serialiser/SerialiseObjects.cs | 6 +++--- .../Modules/World/Serialiser/SerialiserModule.cs | 8 ++++---- 4 files changed, 20 insertions(+), 21 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Serialiser') diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs index e76d40d..bbc4acf 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/IRegionSerialiser.cs @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -using libsecondlife; +using OpenMetaverse; using System.Collections.Generic; using System.IO; using OpenSim.Region.Environment.Scenes; @@ -43,7 +43,7 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser /// /// /// - void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset); + void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset); /// /// Save prims in the xml format @@ -76,14 +76,14 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser /// /// Save prims in the xml2 format, optionally specifying a bounding box for which - /// prims should be saved. If both min and max vectors are LLVector3.Zero, then all prims + /// prims should be saved. If both min and max vectors are Vector3.Zero, then all prims /// are exported. /// /// /// /// /// - void SavePrimsToXml2(Scene scene, TextWriter stream, LLVector3 min, LLVector3 max); + void SavePrimsToXml2(Scene scene, TextWriter stream, Vector3 min, Vector3 max); /// /// Save a set of prims in the xml2 format @@ -94,14 +94,14 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser /// /// Save a set of prims in the xml2 format, optionally specifying a bounding box for which - /// prims should be saved. If both min and max vectors are LLVector3.Zero, then all prims + /// prims should be saved. If both min and max vectors are Vector3.Zero, then all prims /// are exported. /// /// /// /// /// - void SavePrimListToXml2(List entityList, TextWriter stream, LLVector3 min, LLVector3 max); + void SavePrimListToXml2(List entityList, TextWriter stream, Vector3 min, Vector3 max); /// /// Deserializes a scene object from its xml2 representation. This does not load the object into the scene. diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs index 22c9b29..d1cc082 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs @@ -30,8 +30,7 @@ using System.Collections.Generic; using System.IO; //using System.Reflection; using System.Xml; -using Axiom.Math; -using libsecondlife; +using OpenMetaverse; //using log4net; using OpenSim.Framework; using OpenSim.Region.Physics.Manager; @@ -45,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset) + public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) { XmlDocument doc = new XmlDocument(); XmlNode rootNode; @@ -208,7 +207,7 @@ namespace OpenSim.Region.Environment.Scenes SavePrimListToXml2(EntityList, fileName); } - public static void SavePrimsToXml2(Scene scene, TextWriter stream, LLVector3 min, LLVector3 max) + public static void SavePrimsToXml2(Scene scene, TextWriter stream, Vector3 min, Vector3 max) { List EntityList = scene.GetEntities(); @@ -223,7 +222,7 @@ namespace OpenSim.Region.Environment.Scenes StreamWriter stream = new StreamWriter(file); try { - SavePrimListToXml2(entityList, stream, LLVector3.Zero, LLVector3.Zero); + SavePrimListToXml2(entityList, stream, Vector3.Zero, Vector3.Zero); } finally { @@ -236,7 +235,7 @@ namespace OpenSim.Region.Environment.Scenes } } - public static void SavePrimListToXml2(List entityList, TextWriter stream, LLVector3 min, LLVector3 max) + public static void SavePrimListToXml2(List entityList, TextWriter stream, Vector3 min, Vector3 max) { int primCount = 0; stream.WriteLine("\n"); @@ -246,9 +245,9 @@ namespace OpenSim.Region.Environment.Scenes if (ent is SceneObjectGroup) { SceneObjectGroup g = (SceneObjectGroup)ent; - if (!min.Equals(LLVector3.Zero) || !max.Equals(LLVector3.Zero)) + if (!min.Equals(Vector3.Zero) || !max.Equals(Vector3.Zero)) { - LLVector3 pos = g.RootPart.GetWorldPosition(); + Vector3 pos = g.RootPart.GetWorldPosition(); if (min.X > pos.X || min.Y > pos.Y || min.Z > pos.Z) continue; if (max.X < pos.X || max.Y < pos.Y || max.Z < pos.Z) diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs index 0d69553..ffd90bf 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs @@ -40,11 +40,11 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser public string WriteToFile(Scene scene, string dir) { - string targetFileName = dir + "objects.xml"; + string targetFileName = dir + "objects.Xml"; SaveSerialisedToFile(targetFileName, scene); - return "objects.xml"; + return "objects.Xml"; } #endregion @@ -122,4 +122,4 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser #endregion } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs index d722d68..e3eb377 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiserModule.cs @@ -28,7 +28,7 @@ using System; using System.Collections.Generic; using System.IO; -using libsecondlife; +using OpenMetaverse; using Nini.Config; using OpenSim.Region.Environment.Interfaces; using OpenSim.Region.Environment.Modules.Framework.InterfaceCommander; @@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser #region IRegionSerialiser Members - public void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset) + public void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) { SceneXmlLoader.LoadPrimsFromXml(scene, fileName, newIDS, loadOffset); } @@ -112,7 +112,7 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser SceneXmlLoader.SavePrimsToXml2(scene, fileName); } - public void SavePrimsToXml2(Scene scene, TextWriter stream, LLVector3 min, LLVector3 max) + public void SavePrimsToXml2(Scene scene, TextWriter stream, Vector3 min, Vector3 max) { SceneXmlLoader.SavePrimsToXml2(scene, stream, min, max); } @@ -132,7 +132,7 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser SceneXmlLoader.SavePrimListToXml2(entityList, fileName); } - public void SavePrimListToXml2(List entityList, TextWriter stream, LLVector3 min, LLVector3 max) + public void SavePrimListToXml2(List entityList, TextWriter stream, Vector3 min, Vector3 max) { SceneXmlLoader.SavePrimListToXml2(entityList, stream, min, max); } -- cgit v1.1