diff options
author | Sean Dague | 2008-07-23 15:50:32 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-23 15:50:32 +0000 |
commit | 090159defc731fca252b2b3520364712760f0f4e (patch) | |
tree | 78fe9dde5a9902d67aa6d1690cf575d778d154f2 /OpenSim/Region/Environment/Scenes | |
parent | Send Animation data for other avatars to new users joining the region (tested... (diff) | |
download | opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.zip opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.gz opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.bz2 opensim-SC_OLD-090159defc731fca252b2b3520364712760f0f4e.tar.xz |
refactored LandData to use properties, and cleaned up the naming on
the properties a bit to be more consistant with other objects (having things
like .Name .Description, etc).
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 7ff5024..98149f5 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -2444,9 +2444,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2444 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); | 2444 | ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); |
2445 | if (land != null) | 2445 | if (land != null) |
2446 | { | 2446 | { |
2447 | if (land.landData.landingType == (byte)1 && land.landData.userLocation != LLVector3.Zero) | 2447 | if (land.landData.LandingType == (byte)1 && land.landData.UserLocation != LLVector3.Zero) |
2448 | { | 2448 | { |
2449 | agent.startpos = land.landData.userLocation; | 2449 | agent.startpos = land.landData.UserLocation; |
2450 | } | 2450 | } |
2451 | } | 2451 | } |
2452 | } | 2452 | } |
@@ -3311,7 +3311,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3311 | } | 3311 | } |
3312 | else | 3312 | else |
3313 | { | 3313 | { |
3314 | return land.landData.ownerID; | 3314 | return land.landData.OwnerID; |
3315 | } | 3315 | } |
3316 | } | 3316 | } |
3317 | 3317 | ||
@@ -3329,7 +3329,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3329 | } | 3329 | } |
3330 | else | 3330 | else |
3331 | { | 3331 | { |
3332 | land.landData.musicURL = url; | 3332 | land.landData.MusicURL = url; |
3333 | return; | 3333 | return; |
3334 | } | 3334 | } |
3335 | } | 3335 | } |
@@ -3345,7 +3345,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3345 | 3345 | ||
3346 | else | 3346 | else |
3347 | { | 3347 | { |
3348 | land.landData.mediaURL = url; | 3348 | land.landData.MediaURL = url; |
3349 | return; | 3349 | return; |
3350 | } | 3350 | } |
3351 | } | 3351 | } |
@@ -3394,13 +3394,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
3394 | { | 3394 | { |
3395 | if (parcel != null) | 3395 | if (parcel != null) |
3396 | { | 3396 | { |
3397 | if ((parcel.landData.landFlags & (uint)Parcel.ParcelFlags.AllowOtherScripts) != 0) | 3397 | if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowOtherScripts) != 0) |
3398 | { | 3398 | { |
3399 | return true; | 3399 | return true; |
3400 | } | 3400 | } |
3401 | else if ((parcel.landData.landFlags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) | 3401 | else if ((parcel.landData.Flags & (uint)Parcel.ParcelFlags.AllowGroupScripts) != 0) |
3402 | { | 3402 | { |
3403 | if (part.OwnerID == parcel.landData.ownerID || (parcel.landData.isGroupOwned && part.GroupID == parcel.landData.groupID) || ExternalChecks.ExternalChecksCanBeGodLike(part.OwnerID)) | 3403 | if (part.OwnerID == parcel.landData.OwnerID || (parcel.landData.IsGroupOwned && part.GroupID == parcel.landData.GroupID) || ExternalChecks.ExternalChecksCanBeGodLike(part.OwnerID)) |
3404 | { | 3404 | { |
3405 | return true; | 3405 | return true; |
3406 | } | 3406 | } |
@@ -3411,7 +3411,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
3411 | } | 3411 | } |
3412 | else | 3412 | else |
3413 | { | 3413 | { |
3414 | if (part.OwnerID == parcel.landData.ownerID) | 3414 | if (part.OwnerID == parcel.landData.OwnerID) |
3415 | { | 3415 | { |
3416 | return true; | 3416 | return true; |
3417 | } | 3417 | } |