aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2011-05-14 12:57:34 -0700
committerDiva Canto2011-05-14 12:57:34 -0700
commit082a9ecd31d953fd415b515df4f67078a786f8d5 (patch)
tree0ea0bf15d6a46120b69803630141141eb477c995 /OpenSim/Framework
parentStop spamming Nebadon's console when assets aren't found in the asset server. (diff)
parentrefactor: improve PrimLimitsModule to call ILandObject.GetSimulatorMaxPrimCou... (diff)
downloadopensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.zip
opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.tar.gz
opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.tar.bz2
opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-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; }