diff options
| author | Mic Bowman | 2011-07-22 09:02:32 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-07-22 09:02:32 -0700 |
| commit | 4cbc912375ad0d2891231bc3a3ad26112ff6ed05 (patch) | |
| tree | abb8b31c71a83d5934eabde7ceac7f67abf2904e /OpenSim/Framework/RegionInfo.cs | |
| parent | Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into bull... (diff) | |
| parent | Thank you, Michelle Argus, for a patch that adds reading the agent limit (diff) | |
| download | opensim-SC-4cbc912375ad0d2891231bc3a3ad26112ff6ed05.zip opensim-SC-4cbc912375ad0d2891231bc3a3ad26112ff6ed05.tar.gz opensim-SC-4cbc912375ad0d2891231bc3a3ad26112ff6ed05.tar.bz2 opensim-SC-4cbc912375ad0d2891231bc3a3ad26112ff6ed05.tar.xz | |
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); |