mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 12:25:42 +08:00
Fix merge artefact
This commit is contained in:
@@ -774,9 +774,6 @@ namespace OpenSim.Framework
|
||||
configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
|
||||
"Max avatars this sim will hold", "100", true);
|
||||
|
||||
configMember.addConfigurationOption("agent_capacity", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
|
||||
"Max agents this sim will hold", "0", true);
|
||||
|
||||
configMember.addConfigurationOption("scope_id", ConfigurationOption.ConfigurationTypes.TYPE_UUID,
|
||||
"Scope ID for this region", UUID.Zero.ToString(), true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user