diff options
| author | Melanie | 2012-03-22 20:38:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-22 20:38:49 +0000 |
| commit | 33818994810130117bae62ba2123bf8b55f181ea (patch) | |
| tree | eeb54ef00919abbd1a86b08a659570512856ac42 /OpenSim/Framework/ILandObject.cs | |
| parent | Revert "Stop messing order of updates, destroing the defined order of the sel... (diff) | |
| parent | Rework Diva's patch to simplify it (diff) | |
| download | opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.zip opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.gz opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.bz2 opensim-SC_OLD-33818994810130117bae62ba2123bf8b55f181ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -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 dd73b3f..4f98d7b 100644 --- a/OpenSim/Framework/ILandObject.cs +++ b/OpenSim/Framework/ILandObject.cs | |||
| @@ -71,6 +71,7 @@ namespace OpenSim.Framework | |||
| 71 | bool IsEitherBannedOrRestricted(UUID avatar); | 71 | bool IsEitherBannedOrRestricted(UUID avatar); |
| 72 | bool IsBannedFromLand(UUID avatar); | 72 | bool IsBannedFromLand(UUID avatar); |
| 73 | bool IsRestrictedFromLand(UUID avatar); | 73 | bool IsRestrictedFromLand(UUID avatar); |
| 74 | bool IsInLandAccessList(UUID avatar); | ||
| 74 | void SendLandUpdateToClient(IClientAPI remote_client); | 75 | void SendLandUpdateToClient(IClientAPI remote_client); |
| 75 | void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client); | 76 | void SendLandUpdateToClient(bool snap_selection, IClientAPI remote_client); |
| 76 | List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag); | 77 | List<LandAccessEntry> CreateAccessListArrayByFlag(AccessList flag); |