diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Framework/ILandObject.cs | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Framework/ILandObject.cs')
| -rw-r--r-- | OpenSim/Framework/ILandObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs index 4f98d7b..7a24d1e 100644 --- a/OpenSim/Framework/ILandObject.cs +++ b/OpenSim/Framework/ILandObject.cs | |||
| @@ -70,6 +70,7 @@ namespace OpenSim.Framework | |||
| 70 | void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client); | 70 | void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client); |
| 71 | bool IsEitherBannedOrRestricted(UUID avatar); | 71 | bool IsEitherBannedOrRestricted(UUID avatar); |
| 72 | bool IsBannedFromLand(UUID avatar); | 72 | bool IsBannedFromLand(UUID avatar); |
| 73 | bool CanBeOnThisLand(UUID avatar, float posHeight); | ||
| 73 | bool IsRestrictedFromLand(UUID avatar); | 74 | bool IsRestrictedFromLand(UUID avatar); |
| 74 | bool IsInLandAccessList(UUID avatar); | 75 | bool IsInLandAccessList(UUID avatar); |
| 75 | void SendLandUpdateToClient(IClientAPI remote_client); | 76 | void SendLandUpdateToClient(IClientAPI remote_client); |