ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

- cleaning up LandData/ILandObject capitalization issues

Browse Source 
- adding LandDataSerializer to OAR mechanics
This commit is contained in:
dr scofield (aka dirk husemann)
2009-10-02 11:10:52 +02:00
parent a2cdbd784d
commit 2107b67f1b
24 changed files with 429 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/DataSnapshot/LandSnapshot.cs
View File

@@ -87,7 +87,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
//Index sim land
foreach (KeyValuePair<int, Land> curLand in m_scene.LandManager.landList)
{
//if ((curLand.Value.landData.landFlags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)
//if ((curLand.Value.LandData.landFlags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory)
//{
m_landIndexed.Add(curLand.Key, curLand.Value.Copy());
//}
@@ -135,7 +135,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
LandObject land = (LandObject)parcel_interface;
LandData parcel = land.landData;
LandData parcel = land.LandData;
if (m_parent.ExposureLevel.Equals("all") ||
(m_parent.ExposureLevel.Equals("minimum") &&
(parcel.Flags & (uint)ParcelFlags.ShowDirectory) == (uint)ParcelFlags.ShowDirectory))
@@ -393,26 +393,26 @@ namespace OpenSim.Region.DataSnapshot.Providers
{
m_log.DebugFormat("[DATASNAPSHOT] trying {0}, {1}", refX, refY);
// the point we started with already is in the parcel
if (land.containsPoint((int)refX, (int)refY)) return;
if (land.ContainsPoint((int)refX, (int)refY)) return;
// ... otherwise, we have to search for a point within the parcel
uint startX = (uint)land.landData.AABBMin.X;
uint startY = (uint)land.landData.AABBMin.Y;
uint endX = (uint)land.landData.AABBMax.X;
uint endY = (uint)land.landData.AABBMax.Y;
uint startX = (uint)land.LandData.AABBMin.X;
uint startY = (uint)land.LandData.AABBMin.Y;
uint endX = (uint)land.LandData.AABBMax.X;
uint endY = (uint)land.LandData.AABBMax.Y;
// default: center of the parcel
refX = (startX + endX) / 2;
refY = (startY + endY) / 2;
// If the center point is within the parcel, take that one
if (land.containsPoint((int)refX, (int)refY)) return;
if (land.ContainsPoint((int)refX, (int)refY)) return;
// otherwise, go the long way.
for (uint y = startY; y <= endY; ++y)
{
for (uint x = startX; x <= endX; ++x)
{
if (land.containsPoint((int)x, (int)y))
if (land.ContainsPoint((int)x, (int)y))
{
// found a point
refX = x;

2
OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
View File

@@ -139,7 +139,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
xmlobject.AppendChild(node);
node = nodeFactory.CreateNode(XmlNodeType.Element, "parceluuid", "");
node.InnerText = land.landData.GlobalID.ToString();
node.InnerText = land.LandData.GlobalID.ToString();
xmlobject.AppendChild(node);
parent.AppendChild(xmlobject);