diff options
author | dr scofield (aka dirk husemann) | 2009-10-02 11:10:52 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-10-02 11:31:30 +0200 |
commit | 2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7 (patch) | |
tree | 74913862b829b7e56994f2c33ca5fe35638baad1 /OpenSim/Region/DataSnapshot | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.zip opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.gz opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.bz2 opensim-SC_OLD-2107b67f1b145f7718fdb1450be1a7b8dd1a0bf7.tar.xz |
- cleaning up LandData/ILandObject capitalization issues
- adding LandDataSerializer to OAR mechanics
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/DataSnapshot/LandSnapshot.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs index 005659f..51eacef 100644 --- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
87 | //Index sim land | 87 | //Index sim land |
88 | foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList) | 88 | foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList) |
89 | { | 89 | { |
90 | //if ((curLand.Value.landData.landFlags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory) | 90 | //if ((curLand.Value.LandData.landFlags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory) |
91 | //{ | 91 | //{ |
92 | m_landIndexed.Add(curLand.Key, curLand.Value.Copy()); | 92 | m_landIndexed.Add(curLand.Key, curLand.Value.Copy()); |
93 | //} | 93 | //} |
@@ -135,7 +135,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
135 | 135 | ||
136 | LandObject land = (LandObject)parcel_interface; | 136 | LandObject land = (LandObject)parcel_interface; |
137 | 137 | ||
138 | LandData parcel = land.landData; | 138 | LandData parcel = land.LandData; |
139 | if (m_parent.ExposureLevel.Equals("all") || | 139 | if (m_parent.ExposureLevel.Equals("all") || |
140 | (m_parent.ExposureLevel.Equals("minimum") && | 140 | (m_parent.ExposureLevel.Equals("minimum") && |
141 | (parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)) | 141 | (parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)) |
@@ -393,26 +393,26 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
393 | { | 393 | { |
394 | m_log.DebugFormat("[DATASNAPSHOT] trying {0}, {1}", refX, refY); | 394 | m_log.DebugFormat("[DATASNAPSHOT] trying {0}, {1}", refX, refY); |
395 | // the point we started with already is in the parcel | 395 | // the point we started with already is in the parcel |
396 | if (land.containsPoint((int)refX, (int)refY)) return; | 396 | if (land.ContainsPoint((int)refX, (int)refY)) return; |
397 | 397 | ||
398 | // ... otherwise, we have to search for a point within the parcel | 398 | // ... otherwise, we have to search for a point within the parcel |
399 | uint startX = (uint)land.landData.AABBMin.X; | 399 | uint startX = (uint)land.LandData.AABBMin.X; |
400 | uint startY = (uint)land.landData.AABBMin.Y; | 400 | uint startY = (uint)land.LandData.AABBMin.Y; |
401 | uint endX = (uint)land.landData.AABBMax.X; | 401 | uint endX = (uint)land.LandData.AABBMax.X; |
402 | uint endY = (uint)land.landData.AABBMax.Y; | 402 | uint endY = (uint)land.LandData.AABBMax.Y; |
403 | 403 | ||
404 | // default: center of the parcel | 404 | // default: center of the parcel |
405 | refX = (startX + endX) / 2; | 405 | refX = (startX + endX) / 2; |
406 | refY = (startY + endY) / 2; | 406 | refY = (startY + endY) / 2; |
407 | // If the center point is within the parcel, take that one | 407 | // If the center point is within the parcel, take that one |
408 | if (land.containsPoint((int)refX, (int)refY)) return; | 408 | if (land.ContainsPoint((int)refX, (int)refY)) return; |
409 | 409 | ||
410 | // otherwise, go the long way. | 410 | // otherwise, go the long way. |
411 | for (uint y = startY; y <= endY; ++y) | 411 | for (uint y = startY; y <= endY; ++y) |
412 | { | 412 | { |
413 | for (uint x = startX; x <= endX; ++x) | 413 | for (uint x = startX; x <= endX; ++x) |
414 | { | 414 | { |
415 | if (land.containsPoint((int)x, (int)y)) | 415 | if (land.ContainsPoint((int)x, (int)y)) |
416 | { | 416 | { |
417 | // found a point | 417 | // found a point |
418 | refX = x; | 418 | refX = x; |
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs index afd70bb..9639095 100644 --- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs +++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs | |||
@@ -139,7 +139,7 @@ namespace OpenSim.Region.DataSnapshot.Providers | |||
139 | xmlobject.AppendChild(node); | 139 | xmlobject.AppendChild(node); |
140 | 140 | ||
141 | node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", ""); | 141 | node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", ""); |
142 | node.InnerText = land.landData.GlobalID.ToString(); | 142 | node.InnerText = land.LandData.GlobalID.ToString(); |
143 | xmlobject.AppendChild(node); | 143 | xmlobject.AppendChild(node); |
144 | 144 | ||
145 | parent.AppendChild(xmlobject); | 145 | parent.AppendChild(xmlobject); |