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/Framework/Scenes/Scene.cs | |
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/Framework/Scenes/Scene.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 05a6f13..606135b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3206,9 +3206,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
3206 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | 3206 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); |
3207 | if (land != null) | 3207 | if (land != null) |
3208 | { | 3208 | { |
3209 | if (land.landData.LandingType == (byte)1 && land.landData.UserLocation != Vector3.Zero) | 3209 | if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero) |
3210 | { | 3210 | { |
3211 | agent.startpos = land.landData.UserLocation; | 3211 | agent.startpos = land.LandData.UserLocation; |
3212 | } | 3212 | } |
3213 | } | 3213 | } |
3214 | } | 3214 | } |
@@ -3846,13 +3846,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
3846 | 3846 | ||
3847 | public LandData GetLandData(float x, float y) | 3847 | public LandData GetLandData(float x, float y) |
3848 | { | 3848 | { |
3849 | return LandChannel.GetLandObject(x, y).landData; | 3849 | return LandChannel.GetLandObject(x, y).LandData; |
3850 | } | 3850 | } |
3851 | 3851 | ||
3852 | public LandData GetLandData(uint x, uint y) | 3852 | public LandData GetLandData(uint x, uint y) |
3853 | { | 3853 | { |
3854 | m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y); | 3854 | m_log.DebugFormat("[SCENE]: returning land for {0},{1}", x, y); |
3855 | return LandChannel.GetLandObject((int)x, (int)y).landData; | 3855 | return LandChannel.GetLandObject((int)x, (int)y).LandData; |
3856 | } | 3856 | } |
3857 | 3857 | ||
3858 | 3858 | ||
@@ -3880,14 +3880,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
3880 | { | 3880 | { |
3881 | if (parcel != null) | 3881 | if (parcel != null) |
3882 | { | 3882 | { |
3883 | if ((parcel.landData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0) | 3883 | if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowOtherScripts) != 0) |
3884 | { | 3884 | { |
3885 | return true; | 3885 | return true; |
3886 | } | 3886 | } |
3887 | else if ((parcel.landData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0) | 3887 | else if ((parcel.LandData.Flags & (uint)ParcelFlags.AllowGroupScripts) != 0) |
3888 | { | 3888 | { |
3889 | if (part.OwnerID == parcel.landData.OwnerID | 3889 | if (part.OwnerID == parcel.LandData.OwnerID |
3890 | || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) | 3890 | || (parcel.LandData.IsGroupOwned && part.GroupID == parcel.LandData.GroupID) |
3891 | || Permissions.IsGod(part.OwnerID)) | 3891 | || Permissions.IsGod(part.OwnerID)) |
3892 | { | 3892 | { |
3893 | return true; | 3893 | return true; |
@@ -3899,7 +3899,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3899 | } | 3899 | } |
3900 | else | 3900 | else |
3901 | { | 3901 | { |
3902 | if (part.OwnerID == parcel.landData.OwnerID) | 3902 | if (part.OwnerID == parcel.LandData.OwnerID) |
3903 | { | 3903 | { |
3904 | return true; | 3904 | return true; |
3905 | } | 3905 | } |