diff options
Diffstat (limited to 'OpenSim/Region/DataSnapshot/LandSnapshot.cs')
-rw-r--r-- | OpenSim/Region/DataSnapshot/LandSnapshot.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 930ea8f..b0ba29d 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs | |||
@@ -29,14 +29,14 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Xml; | 31 | using System.Xml; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Region.DataSnapshot.Interfaces; | 35 | using OpenSim.Region.DataSnapshot.Interfaces; |
36 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Environment.Interfaces; |
37 | using OpenSim.Region.Environment.Modules.World.Land; | 37 | using OpenSim.Region.Environment.Modules.World.Land; |
38 | using OpenSim.Region.Environment.Scenes; | 38 | using OpenSim.Region.Environment.Scenes; |
39 | using libsecondlife.Packets; | 39 | using OpenMetaverse.Packets; |
40 | 40 | ||
41 | namespace OpenSim.Region.DataSnapshot.Providers | 41 | namespace OpenSim.Region.DataSnapshot.Providers |
42 | { | 42 | { |
@@ -179,16 +179,16 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
179 | 179 | ||
180 | //default location | 180 | //default location |
181 | XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); | 181 | XmlNode tpLocation = nodeFactory.CreateNode(XmlNodeType.Element, "location", ""); |
182 | LLVector3 loc = parcel.UserLocation; | 182 | Vector3 loc = parcel.UserLocation; |
183 | if (loc.Equals(LLVector3.Zero)) // This test is mute at this point: the location is wrong by default | 183 | if (loc.Equals(Vector3.Zero)) // This test is mute at this point: the location is wrong by default |
184 | loc = new LLVector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2); | 184 | loc = new Vector3((parcel.AABBMax.X - parcel.AABBMin.X) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2, (parcel.AABBMax.Y - parcel.AABBMin.Y) / 2); |
185 | tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString(); | 185 | tpLocation.InnerText = loc.X.ToString() + "/" + loc.Y.ToString() + "/" + loc.Z.ToString(); |
186 | xmlparcel.AppendChild(tpLocation); | 186 | xmlparcel.AppendChild(tpLocation); |
187 | 187 | ||
188 | //TODO: figure how to figure out teleport system landData.landingType | 188 | //TODO: figure how to figure out teleport system landData.landingType |
189 | 189 | ||
190 | //land texture snapshot uuid | 190 | //land texture snapshot uuid |
191 | if (parcel.SnapshotID != LLUUID.Zero) | 191 | if (parcel.SnapshotID != UUID.Zero) |
192 | { | 192 | { |
193 | XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", ""); | 193 | XmlNode textureuuid = nodeFactory.CreateNode(XmlNodeType.Element, "image", ""); |
194 | textureuuid.InnerText = parcel.SnapshotID.ToString(); | 194 | textureuuid.InnerText = parcel.SnapshotID.ToString(); |
@@ -196,7 +196,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
196 | } | 196 | } |
197 | 197 | ||
198 | //attached user and group | 198 | //attached user and group |
199 | if (parcel.GroupID != LLUUID.Zero) | 199 | if (parcel.GroupID != UUID.Zero) |
200 | { | 200 | { |
201 | XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", ""); | 201 | XmlNode groupblock = nodeFactory.CreateNode(XmlNodeType.Element, "group", ""); |
202 | XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); | 202 | XmlNode groupuuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); |
@@ -213,7 +213,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
213 | { | 213 | { |
214 | XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", ""); | 214 | XmlNode userblock = nodeFactory.CreateNode(XmlNodeType.Element, "owner", ""); |
215 | 215 | ||
216 | LLUUID userOwnerUUID = parcel.OwnerID; | 216 | UUID userOwnerUUID = parcel.OwnerID; |
217 | 217 | ||
218 | XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); | 218 | XmlNode useruuid = nodeFactory.CreateNode(XmlNodeType.Element, "uuid", ""); |
219 | useruuid.InnerText = userOwnerUUID.ToString(); | 219 | useruuid.InnerText = userOwnerUUID.ToString(); |
@@ -298,7 +298,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
298 | IClientAPI remote_client) { this.Stale = true; }; | 298 | IClientAPI remote_client) { this.Stale = true; }; |
299 | client.OnParcelPropertiesUpdateRequest += delegate(LandUpdateArgs args, int local_id, | 299 | client.OnParcelPropertiesUpdateRequest += delegate(LandUpdateArgs args, int local_id, |
300 | IClientAPI remote_client) { this.Stale = true; }; | 300 | IClientAPI remote_client) { this.Stale = true; }; |
301 | client.OnParcelBuy += delegate (LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, | 301 | client.OnParcelBuy += delegate (UUID agentId, UUID groupId, bool final, bool groupOwned, |
302 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) | 302 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) |
303 | { this.Stale = true; }; | 303 | { this.Stale = true; }; |
304 | } | 304 | } |
@@ -315,4 +315,4 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
315 | 315 | ||
316 | #endregion | 316 | #endregion |
317 | } | 317 | } |
318 | } \ No newline at end of file | 318 | } |