diff options
author | Mic Bowman | 2011-04-25 08:41:21 -0700 |
---|---|---|
committer | Mic Bowman | 2011-04-25 08:41:21 -0700 |
commit | 1d7c83c39fffe6580f4cf1c693581979c97d7eaa (patch) | |
tree | e600e4551ba957aa47dfbba7925c65ee7d06ccfc /OpenSim/Region/CoreModules/World | |
parent | Fix a bug looping through the priority queues. This should fix the problem (diff) | |
parent | Removed unused libraries: RAILS.dll and dependencies. (diff) | |
download | opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.zip opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.gz opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.bz2 opensim-SC_OLD-1d7c83c39fffe6580f4cf1c693581979c97d7eaa.tar.xz |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs | 5 |
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 | ||