aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfo.cs
diff options
context:
space:
mode:
authorDev Random2014-04-10 21:08:54 -0400
committerMelanie2014-04-12 09:28:29 +0100
commitf0998a9222bdbd27bc11ed106cb4087c18b2c05e (patch)
tree37a91063024eee3aae73fb3443fcc57f4a6778f7 /OpenSim/Framework/RegionInfo.cs
parentminor: use constants instead of magic numbers in llRequestAgentData() where p... (diff)
downloadopensim-SC_OLD-f0998a9222bdbd27bc11ed106cb4087c18b2c05e.zip
opensim-SC_OLD-f0998a9222bdbd27bc11ed106cb4087c18b2c05e.tar.gz
opensim-SC_OLD-f0998a9222bdbd27bc11ed106cb4087c18b2c05e.tar.bz2
opensim-SC_OLD-f0998a9222bdbd27bc11ed106cb4087c18b2c05e.tar.xz
Add per-user checking to PrimLimitsModule
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
-rw-r--r--OpenSim/Framework/RegionInfo.cs18
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 2390118..44d05b7 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -127,6 +127,7 @@ namespace OpenSim.Framework
127 private int m_physPrimMax = 0; 127 private int m_physPrimMax = 0;
128 private bool m_clampPrimSize = false; 128 private bool m_clampPrimSize = false;
129 private int m_objectCapacity = 0; 129 private int m_objectCapacity = 0;
130 private int m_maxPrimsPerUser = -1;
130 private int m_linksetCapacity = 0; 131 private int m_linksetCapacity = 0;
131 private int m_agentCapacity = 0; 132 private int m_agentCapacity = 0;
132 private string m_regionType = String.Empty; 133 private string m_regionType = String.Empty;
@@ -325,6 +326,11 @@ namespace OpenSim.Framework
325 get { return m_objectCapacity; } 326 get { return m_objectCapacity; }
326 } 327 }
327 328
329 public int MaxPrimsPerUser
330 {
331 get { return m_maxPrimsPerUser; }
332 }
333
328 public int LinksetCapacity 334 public int LinksetCapacity
329 { 335 {
330 get { return m_linksetCapacity; } 336 get { return m_linksetCapacity; }
@@ -709,6 +715,9 @@ namespace OpenSim.Framework
709 m_objectCapacity = config.GetInt("MaxPrims", 15000); 715 m_objectCapacity = config.GetInt("MaxPrims", 15000);
710 allKeys.Remove("MaxPrims"); 716 allKeys.Remove("MaxPrims");
711 717
718 m_maxPrimsPerUser = config.GetInt("MaxPrimsPerUser", -1);
719 allKeys.Remove("MaxPrimsPerUser");
720
712 m_linksetCapacity = config.GetInt("LinksetPrims", 0); 721 m_linksetCapacity = config.GetInt("LinksetPrims", 0);
713 allKeys.Remove("LinksetPrims"); 722 allKeys.Remove("LinksetPrims");
714 723
@@ -834,6 +843,9 @@ namespace OpenSim.Framework
834 if (m_objectCapacity > 0) 843 if (m_objectCapacity > 0)
835 config.Set("MaxPrims", m_objectCapacity); 844 config.Set("MaxPrims", m_objectCapacity);
836 845
846 if (m_maxPrimsPerUser > -1)
847 config.Set("MaxPrimsPerUser", m_maxPrimsPerUser);
848
837 if (m_linksetCapacity > 0) 849 if (m_linksetCapacity > 0)
838 config.Set("LinksetPrims", m_linksetCapacity); 850 config.Set("LinksetPrims", m_linksetCapacity);
839 851
@@ -946,6 +958,9 @@ namespace OpenSim.Framework
946 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 958 configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
947 "Max objects this sim will hold", m_objectCapacity.ToString(), true); 959 "Max objects this sim will hold", m_objectCapacity.ToString(), true);
948 960
961 configMember.addConfigurationOption("prims_per_user", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
962 "Max objects one user may rez", m_maxPrimsPerUser.ToString(), true);
963
949 configMember.addConfigurationOption("linkset_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 964 configMember.addConfigurationOption("linkset_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
950 "Max prims an object will hold", m_linksetCapacity.ToString(), true); 965 "Max prims an object will hold", m_linksetCapacity.ToString(), true);
951 966
@@ -1096,6 +1111,9 @@ namespace OpenSim.Framework
1096 case "object_capacity": 1111 case "object_capacity":
1097 m_objectCapacity = (int)configuration_result; 1112 m_objectCapacity = (int)configuration_result;
1098 break; 1113 break;
1114 case "prims_per_user":
1115 m_maxPrimsPerUser = (int)configuration_result;
1116 break;
1099 case "linkset_capacity": 1117 case "linkset_capacity":
1100 m_linksetCapacity = (int)configuration_result; 1118 m_linksetCapacity = (int)configuration_result;
1101 break; 1119 break;