diff options
author | Melanie | 2013-12-11 01:39:56 +0000 |
---|---|---|
committer | Melanie | 2013-12-11 01:39:56 +0000 |
commit | 5b73b9c4a85335ba837280688b903fef44be8f35 (patch) | |
tree | bd560ec720eb6fbf86b744522b2509071bc31a30 /OpenSim/Framework/ILandObject.cs | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.zip opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.gz opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.bz2 opensim-SC_OLD-5b73b9c4a85335ba837280688b903fef44be8f35.tar.xz |
Committing the Avination Scene Presence and related texture code
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
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); |