diff options
author | Melanie | 2011-04-06 09:22:55 +0100 |
---|---|---|
committer | Melanie | 2011-04-06 09:22:55 +0100 |
commit | 407c2b182303d3bc1214e71f407bddc28c671a55 (patch) | |
tree | e9658864b8dcad3c2dced73e97b505941576de9b /OpenSim/Framework/ILandChannel.cs | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Change some text to make the autoreturn mechanism more obvious, and align wit... (diff) | |
download | opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.zip opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.gz opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.bz2 opensim-SC-407c2b182303d3bc1214e71f407bddc28c671a55.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/ILandChannel.cs')
-rw-r--r-- | OpenSim/Framework/ILandChannel.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/ILandChannel.cs b/OpenSim/Framework/ILandChannel.cs index 30bae16..869d4c8 100644 --- a/OpenSim/Framework/ILandChannel.cs +++ b/OpenSim/Framework/ILandChannel.cs | |||
@@ -77,7 +77,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
77 | /// </param> | 77 | /// </param> |
78 | void Clear(bool setupDefaultParcel); | 78 | void Clear(bool setupDefaultParcel); |
79 | 79 | ||
80 | bool IsLandPrimCountTainted(); | ||
81 | bool IsForcefulBansAllowed(); | 80 | bool IsForcefulBansAllowed(); |
82 | void UpdateLandObject(int localID, LandData data); | 81 | void UpdateLandObject(int localID, LandData data); |
83 | void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient); | 82 | void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient); |