diff options
| author | Melanie | 2011-07-22 12:38:08 +0100 |
|---|---|---|
| committer | Melanie | 2011-07-22 12:38:08 +0100 |
| commit | 705f70064e74b92a77deed9ad769af22e4923448 (patch) | |
| tree | 677c91844b758fdf43eea6cef6a44d5f9b0e2342 /OpenSim/Framework/RegionInfo.cs | |
| parent | Thank you, Michelle Argus, for a patch that adds reading the agent limit (diff) | |
| download | opensim-SC-705f70064e74b92a77deed9ad769af22e4923448.zip opensim-SC-705f70064e74b92a77deed9ad769af22e4923448.tar.gz opensim-SC-705f70064e74b92a77deed9ad769af22e4923448.tar.bz2 opensim-SC-705f70064e74b92a77deed9ad769af22e4923448.tar.xz | |
Fix merge artefact
Diffstat (limited to 'OpenSim/Framework/RegionInfo.cs')
| -rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 04cfa93..b0202fb 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
| @@ -774,9 +774,6 @@ namespace OpenSim.Framework | |||
| 774 | configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | 774 | configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, |
| 775 | "Max avatars this sim will hold", "100", true); | 775 | "Max avatars this sim will hold", "100", true); |
| 776 | 776 | ||
| 777 | configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32, | ||
| 778 | "Max agents this sim will hold", "0", true); | ||
| 779 | |||
| 780 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, | 777 | configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID, |
| 781 | "Scope ID for this region", UUID.Zero.ToString(), true); | 778 | "Scope ID for this region", UUID.Zero.ToString(), true); |
| 782 | 779 | ||