ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into diva-textures

Browse Source
This commit is contained in:
Melanie
2009-10-02 19:03:22 +01:00
parent 6def897556 2e1c76f836
commit ce8974539e
28 changed files with 481 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3206,9 +3206,9 @@ namespace OpenSim.Region.Framework.Scenes
ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
if (land != null)
{
if (land.landData.LandingType == (byte)1 && land.landData.UserLocation != Vector3.Zero)
if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero)
{
agent.startpos = land.landData.UserLocation;
agent.startpos = land.LandData.UserLocation;
}
}
}
@@ -3846,13 +3846,13 @@ namespace OpenSim.Region.Framework.Scenes
public LandData GetLandData(float x, float y)
{
return LandChannel.GetLandObject(x, y).landData;
return LandChannel.GetLandObject(x, y).LandData;
}
public LandData GetLandData(uint x, uint y)
{
m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y);
return LandChannel.GetLandObject((int)x, (int)y).landData;
return LandChannel.GetLandObject((int)x, (int)y).LandData;
}
@@ -3880,14 +3880,14 @@ namespace OpenSim.Region.Framework.Scenes
{
if (parcel != null)
{
if ((parcel.landData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0)
if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0)
{
return true;
}
else if ((parcel.landData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
else if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0)
{
if (part.OwnerID == parcel.landData.OwnerID
|| (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID)
if (part.OwnerID == parcel.LandData.OwnerID
|| (parcel.LandData.IsGroupOwned && part.GroupID == parcel.LandData.GroupID)
|| Permissions.IsGod(part.OwnerID))
{
return true;
@@ -3899,7 +3899,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
if (part.OwnerID == parcel.landData.OwnerID)
if (part.OwnerID == parcel.LandData.OwnerID)
{
return true;
}

12
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@@ -1320,15 +1320,15 @@ namespace OpenSim.Region.Framework.Scenes
ILandObject parcel = m_scene.LandChannel.GetLandObject(
m_rootPart.GroupPosition.X, m_rootPart.GroupPosition.Y);
if (parcel != null && parcel.landData != null &&
parcel.landData.OtherCleanTime != 0)
if (parcel != null && parcel.LandData != null &&
parcel.LandData.OtherCleanTime != 0)
{
if (parcel.landData.OwnerID != OwnerID &&
(parcel.landData.GroupID != GroupID ||
parcel.landData.GroupID == UUID.Zero))
if (parcel.LandData.OwnerID != OwnerID &&
(parcel.LandData.GroupID != GroupID ||
parcel.LandData.GroupID == UUID.Zero))
{
if ((DateTime.Now - RootPart.Rezzed).TotalMinutes >
parcel.landData.OtherCleanTime)
parcel.LandData.OtherCleanTime)
{
DetachFromBackup();
m_log.InfoFormat("[SCENE]: Returning object {0} due to parcel auto return", RootPart.UUID.ToString());