From 3b1c91c24bee11e1872ddb79c030c72c8ddb434b Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Fri, 17 Dec 2010 22:35:08 +0000 Subject: remove mono compiler warnings --- OpenSim/Region/Framework/Scenes/EntityManager.cs | 3 ++- OpenSim/Region/Framework/Scenes/Scene.Permissions.cs | 4 ++-- OpenSim/Region/Framework/Scenes/Scene.cs | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs index 0defa93..1812bd2 100644 --- a/OpenSim/Region/Framework/Scenes/EntityManager.cs +++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs @@ -36,7 +36,8 @@ namespace OpenSim.Region.Framework.Scenes { public class EntityManager { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private readonly DoubleDictionary m_entities = new DoubleDictionary(); public int Count diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs index 1295e58..66439ab 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs @@ -91,7 +91,7 @@ namespace OpenSim.Region.Framework.Scenes public class ScenePermissions { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); +// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private Scene m_scene; @@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes public event IssueEstateCommandHandler OnIssueEstateCommand; public event IsGodHandler OnIsGod; public event IsAdministratorHandler OnIsAdministrator; - public event EditParcelHandler OnEditParcel; +// public event EditParcelHandler OnEditParcel; public event EditParcelPropertiesHandler OnEditParcelProperties; public event SellParcelHandler OnSellParcel; public event AbandonParcelHandler OnAbandonParcel; diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 50efe65..5517dc3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -134,9 +134,9 @@ namespace OpenSim.Region.Framework.Scenes // TODO: Possibly stop other classes being able to manipulate this directly. private SceneGraph m_sceneGraph; private volatile int m_bordersLocked; - private int m_RestartTimerCounter; +// private int m_RestartTimerCounter; private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing - private int m_incrementsof15seconds; +// private int m_incrementsof15seconds; private volatile bool m_backingup; private Dictionary m_returns = new Dictionary(); private Dictionary m_groupsWithTargets = new Dictionary(); @@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes private int m_update_events = 1; private int m_update_backup = 200; private int m_update_terrain = 50; - private int m_update_land = 1; +// private int m_update_land = 1; private int m_update_coarse_locations = 80; private int frameMS; @@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes private Timer m_mapGenerationTimer = new Timer(); private bool m_generateMaptiles; - private Dictionary m_UserNamesCache = new Dictionary(); +// private Dictionary m_UserNamesCache = new Dictionary(); #endregion Fields -- cgit v1.1