From 9be2d5c77da8c2fc6c953e26a8b1412642588eb2 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 7 Oct 2012 03:03:24 +0100
Subject: Fix merge issues

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6e3e436..8d112db 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -825,13 +825,6 @@ namespace OpenSim.Region.Framework.Scenes
                     m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
                     m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
 
-                    IConfig packetConfig = m_config.Configs["PacketPool"];
-                    if (packetConfig != null)
-                    {
-                        PacketPool.Instance.RecyclePackets = packetConfig.GetBoolean("RecyclePackets", true);
-                        PacketPool.Instance.RecycleDataBlocks = packetConfig.GetBoolean("RecycleDataBlocks", true);
-                    }
-
                     m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
                     m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
                     CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
-- 
cgit v1.1