aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/ILandObject.cs
diff options
context:
space:
mode:
authorMelanie2011-05-14 21:09:52 +0100
committerMelanie2011-05-14 21:09:52 +0100
commit37a7b8786248e3af9774b8051dc29001b49179bd (patch)
tree18f5ae3490fe16ddf906482ef578bb590291d592 /OpenSim/Framework/ILandObject.cs
parentGlobally throttle script channel 0 comms to 5/s with 10s burst to prevent lag (diff)
parentAlso changed a couple of messages in WebUtil from Wanr/Info to Debug. (diff)
downloadopensim-SC_OLD-37a7b8786248e3af9774b8051dc29001b49179bd.zip
opensim-SC_OLD-37a7b8786248e3af9774b8051dc29001b49179bd.tar.gz
opensim-SC_OLD-37a7b8786248e3af9774b8051dc29001b49179bd.tar.bz2
opensim-SC_OLD-37a7b8786248e3af9774b8051dc29001b49179bd.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/ILandObject.cs')
-rw-r--r--OpenSim/Framework/ILandObject.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ILandObject.cs b/OpenSim/Framework/ILandObject.cs
index 5a55b02..0316944 100644
--- a/OpenSim/Framework/ILandObject.cs
+++ b/OpenSim/Framework/ILandObject.cs
@@ -35,8 +35,8 @@ namespace OpenSim.Framework
35 35
36 public interface ILandObject 36 public interface ILandObject
37 { 37 {
38 int GetParcelMaxPrimCount(ILandObject thisObject); 38 int GetParcelMaxPrimCount();
39 int GetSimulatorMaxPrimCount(ILandObject thisObject); 39 int GetSimulatorMaxPrimCount();
40 int GetPrimsFree(); 40 int GetPrimsFree();
41 41
42 LandData LandData { get; set; } 42 LandData LandData { get; set; }