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 | |
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')
3 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index deec444..fc1ddef 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
70 | if (meshConfig == null) | 70 | if (meshConfig == null) |
71 | return; | 71 | return; |
72 | 72 | ||
73 | m_enabled = meshConfig.GetBoolean("ColladaMesh", true); | 73 | m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); |
74 | } | 74 | } |
75 | 75 | ||
76 | public void AddRegion(Scene pScene) | 76 | public void AddRegion(Scene pScene) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs index d651cb2..3d4c7b7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/NewFileAgentInventoryVariablePriceModule.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets | |||
72 | if (meshConfig == null) | 72 | if (meshConfig == null) |
73 | return; | 73 | return; |
74 | 74 | ||
75 | m_enabled = meshConfig.GetBoolean("ColladaMesh", true); | 75 | m_enabled = meshConfig.GetBoolean("AllowMeshUpload", true); |
76 | } | 76 | } |
77 | 77 | ||
78 | public void AddRegion(Scene pScene) | 78 | public void AddRegion(Scene pScene) |
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 | ||