From 705f70064e74b92a77deed9ad769af22e4923448 Mon Sep 17 00:00:00 2001
From: Melanie <melanie@t-data.com>
Date: Fri, 22 Jul 2011 12:38:08 +0100
Subject: [PATCH] Fix merge artefact

---
 OpenSim/Framework/RegionInfo.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 04cfa93b8e..b0202fbf99 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -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);