aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorE. Allen Soard2011-04-15 06:17:26 -0700
committerJustin Clark-Casey (justincc)2011-04-23 00:40:08 +0100
commit44e43d9d240735695668849fbd7aaafd339f262d (patch)
treeb3ccec8dfed67a7c007aed4feeedb5ce88308e1c /OpenSim/Region
parentprint invalid command message to the console, not the log (diff)
downloadopensim-SC_OLD-44e43d9d240735695668849fbd7aaafd339f262d.zip
opensim-SC_OLD-44e43d9d240735695668849fbd7aaafd339f262d.tar.gz
opensim-SC_OLD-44e43d9d240735695668849fbd7aaafd339f262d.tar.bz2
opensim-SC_OLD-44e43d9d240735695668849fbd7aaafd339f262d.tar.xz
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index ab90e90..3aed6ba 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -125,7 +125,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
125 else 125 else
126 Scene.RegionInfo.RegionSettings.AllowLandResell = true; 126 Scene.RegionInfo.RegionSettings.AllowLandResell = true;
127 127
128 Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents; 128 if((byte)maxAgents <= Scene.RegionInfo.AgentCapacity)
129 Scene.RegionInfo.RegionSettings.AgentLimit = (byte) maxAgents;
130 else
131 Scene.RegionInfo.RegionSettings.AgentLimit = Scene.RegionInfo.AgentCapacity;
129 132
130 Scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor; 133 Scene.RegionInfo.RegionSettings.ObjectBonus = objectBonusFactor;
131 134