diff options
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 4c007d6..0e41535 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -760,7 +760,10 @@ namespace OpenSim.Framework | |||
| 760 | "Clamp prims to max size", "false", true); | 760 | "Clamp prims to max size", "false", true); |
| 761 | 761 | ||
| 762 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 762 | configMember.addConfigurationOption("object_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
| 763 | "Max objects this sim will hold", "0", true); | 763 | "Max objects this sim will hold", "15000", true); |
| 764 | |||
| 765 | configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | ||
| 766 | "Max avatars this sim will hold", "100", true); | ||
| 764 | 767 | ||
| 765 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | 768 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
| 766 | "Scope ID for this region", UUID.Zero.ToString(), true); | 769 | "Scope ID for this region", UUID.Zero.ToString(), true); |