aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs3
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Permissions.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
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
36{ 36{
37 public class EntityManager 37 public class EntityManager
38 { 38 {
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40
40 private readonly DoubleDictionary<UUID, uint, EntityBase> m_entities = new DoubleDictionary<UUID, uint, EntityBase>(); 41 private readonly DoubleDictionary<UUID, uint, EntityBase> m_entities = new DoubleDictionary<UUID, uint, EntityBase>();
41 42
42 public int Count 43 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
91 91
92 public class ScenePermissions 92 public class ScenePermissions
93 { 93 {
94 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 94// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
95 95
96 private Scene m_scene; 96 private Scene m_scene;
97 97
@@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes
131 public event IssueEstateCommandHandler OnIssueEstateCommand; 131 public event IssueEstateCommandHandler OnIssueEstateCommand;
132 public event IsGodHandler OnIsGod; 132 public event IsGodHandler OnIsGod;
133 public event IsAdministratorHandler OnIsAdministrator; 133 public event IsAdministratorHandler OnIsAdministrator;
134 public event EditParcelHandler OnEditParcel; 134// public event EditParcelHandler OnEditParcel;
135 public event EditParcelPropertiesHandler OnEditParcelProperties; 135 public event EditParcelPropertiesHandler OnEditParcelProperties;
136 public event SellParcelHandler OnSellParcel; 136 public event SellParcelHandler OnSellParcel;
137 public event AbandonParcelHandler OnAbandonParcel; 137 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
134 // TODO: Possibly stop other classes being able to manipulate this directly. 134 // TODO: Possibly stop other classes being able to manipulate this directly.
135 private SceneGraph m_sceneGraph; 135 private SceneGraph m_sceneGraph;
136 private volatile int m_bordersLocked; 136 private volatile int m_bordersLocked;
137 private int m_RestartTimerCounter; 137// private int m_RestartTimerCounter;
138 private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing 138 private readonly Timer m_restartTimer = new Timer(15000); // Wait before firing
139 private int m_incrementsof15seconds; 139// private int m_incrementsof15seconds;
140 private volatile bool m_backingup; 140 private volatile bool m_backingup;
141 private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>(); 141 private Dictionary<UUID, ReturnInfo> m_returns = new Dictionary<UUID, ReturnInfo>();
142 private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>(); 142 private Dictionary<UUID, SceneObjectGroup> m_groupsWithTargets = new Dictionary<UUID, SceneObjectGroup>();
@@ -149,7 +149,7 @@ namespace OpenSim.Region.Framework.Scenes
149 private int m_update_events = 1; 149 private int m_update_events = 1;
150 private int m_update_backup = 200; 150 private int m_update_backup = 200;
151 private int m_update_terrain = 50; 151 private int m_update_terrain = 50;
152 private int m_update_land = 1; 152// private int m_update_land = 1;
153 private int m_update_coarse_locations = 80; 153 private int m_update_coarse_locations = 80;
154 154
155 private int frameMS; 155 private int frameMS;
@@ -187,7 +187,7 @@ namespace OpenSim.Region.Framework.Scenes
187 private Timer m_mapGenerationTimer = new Timer(); 187 private Timer m_mapGenerationTimer = new Timer();
188 private bool m_generateMaptiles; 188 private bool m_generateMaptiles;
189 189
190 private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>(); 190// private Dictionary<UUID, string[]> m_UserNamesCache = new Dictionary<UUID, string[]>();
191 191
192 #endregion Fields 192 #endregion Fields
193 193