diff options
| author | Melanie | 2011-01-28 02:36:20 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-28 02:36:20 +0000 |
| commit | 3f200da8781a91ced8733bd4bac3ee17ae2de518 (patch) | |
| tree | 5a28bcf8726927dbaafd659a36f70e490aaea99b /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.zip opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.gz opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.bz2 opensim-SC_OLD-3f200da8781a91ced8733bd4bac3ee17ae2de518.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ILandObject.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs index 576b645..eeb9d3a 100644 --- a/OpenSim/Region/Framework/Interfaces/ILandObject.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs | |||
| @@ -39,6 +39,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 39 | { | 39 | { |
| 40 | int GetParcelMaxPrimCount(ILandObject thisObject); | 40 | int GetParcelMaxPrimCount(ILandObject thisObject); |
| 41 | int GetSimulatorMaxPrimCount(ILandObject thisObject); | 41 | int GetSimulatorMaxPrimCount(ILandObject thisObject); |
| 42 | int GetPrimsFree(); | ||
| 42 | 43 | ||
| 43 | LandData LandData { get; set; } | 44 | LandData LandData { get; set; } |
| 44 | bool[,] LandBitmap { get; set; } | 45 | bool[,] LandBitmap { get; set; } |