diff options
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Serialiser/SceneXmlLoader.cs | 15 |
1 files changed, 7 insertions, 8 deletions
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; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | //using System.Reflection; | 31 | //using System.Reflection; |
32 | using System.Xml; | 32 | using System.Xml; |
33 | using Axiom.Math; | 33 | using OpenMetaverse; |
34 | using libsecondlife; | ||
35 | //using log4net; | 34 | //using log4net; |
36 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
37 | using OpenSim.Region.Physics.Manager; | 36 | using OpenSim.Region.Physics.Manager; |
@@ -45,7 +44,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
45 | { | 44 | { |
46 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
47 | 46 | ||
48 | public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, LLVector3 loadOffset) | 47 | public static void LoadPrimsFromXml(Scene scene, string fileName, bool newIDS, Vector3 loadOffset) |
49 | { | 48 | { |
50 | XmlDocument doc = new XmlDocument(); | 49 | XmlDocument doc = new XmlDocument(); |
51 | XmlNode rootNode; | 50 | XmlNode rootNode; |
@@ -208,7 +207,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
208 | SavePrimListToXml2(EntityList, fileName); | 207 | SavePrimListToXml2(EntityList, fileName); |
209 | } | 208 | } |
210 | 209 | ||
211 | public static void SavePrimsToXml2(Scene scene, TextWriter stream, LLVector3 min, LLVector3 max) | 210 | public static void SavePrimsToXml2(Scene scene, TextWriter stream, Vector3 min, Vector3 max) |
212 | { | 211 | { |
213 | List<EntityBase> EntityList = scene.GetEntities(); | 212 | List<EntityBase> EntityList = scene.GetEntities(); |
214 | 213 | ||
@@ -223,7 +222,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
223 | StreamWriter stream = new StreamWriter(file); | 222 | StreamWriter stream = new StreamWriter(file); |
224 | try | 223 | try |
225 | { | 224 | { |
226 | SavePrimListToXml2(entityList, stream, LLVector3.Zero, LLVector3.Zero); | 225 | SavePrimListToXml2(entityList, stream, Vector3.Zero, Vector3.Zero); |
227 | } | 226 | } |
228 | finally | 227 | finally |
229 | { | 228 | { |
@@ -236,7 +235,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
236 | } | 235 | } |
237 | } | 236 | } |
238 | 237 | ||
239 | public static void SavePrimListToXml2(List<EntityBase> entityList, TextWriter stream, LLVector3 min, LLVector3 max) | 238 | public static void SavePrimListToXml2(List<EntityBase> entityList, TextWriter stream, Vector3 min, Vector3 max) |
240 | { | 239 | { |
241 | int primCount = 0; | 240 | int primCount = 0; |
242 | stream.WriteLine("<scene>\n"); | 241 | stream.WriteLine("<scene>\n"); |
@@ -246,9 +245,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
246 | if (ent is SceneObjectGroup) | 245 | if (ent is SceneObjectGroup) |
247 | { | 246 | { |
248 | SceneObjectGroup g = (SceneObjectGroup)ent; | 247 | SceneObjectGroup g = (SceneObjectGroup)ent; |
249 | if (!min.Equals(LLVector3.Zero) || !max.Equals(LLVector3.Zero)) | 248 | if (!min.Equals(Vector3.Zero) || !max.Equals(Vector3.Zero)) |
250 | { | 249 | { |
251 | LLVector3 pos = g.RootPart.GetWorldPosition(); | 250 | Vector3 pos = g.RootPart.GetWorldPosition(); |
252 | if (min.X > pos.X || min.Y > pos.Y || min.Z > pos.Z) | 251 | if (min.X > pos.X || min.Y > pos.Y || min.Z > pos.Z) |
253 | continue; | 252 | continue; |
254 | if (max.X < pos.X || max.Y < pos.Y || max.Z < pos.Z) | 253 | if (max.X < pos.X || max.Y < pos.Y || max.Z < pos.Z) |