aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorSean Dague2008-05-09 18:57:19 +0000
committerSean Dague2008-05-09 18:57:19 +0000
commit835e44b9875123adf97b8b002c5d43f0b5deaaf4 (patch)
tree68255d76d7665877b3de82be3e95468902b599e6 /OpenSim/Region
parent*Land/Parcel upates are now correct with a significant movement by the Client (diff)
downloadopensim-SC_OLD-835e44b9875123adf97b8b002c5d43f0b5deaaf4.zip
opensim-SC_OLD-835e44b9875123adf97b8b002c5d43f0b5deaaf4.tar.gz
opensim-SC_OLD-835e44b9875123adf97b8b002c5d43f0b5deaaf4.tar.bz2
opensim-SC_OLD-835e44b9875123adf97b8b002c5d43f0b5deaaf4.tar.xz
m_logs always need to be private static readonly otherwise we
get close errors.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/DataSnapshot/DataRequestHandler.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/DataSnapshotManager.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/LandSnapshot.cs2
-rw-r--r--OpenSim/Region/DataSnapshot/ObjectSnapshot.cs2
4 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
index 7e096df..2b18871 100644
--- a/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
+++ b/OpenSim/Region/DataSnapshot/DataRequestHandler.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Region.DataSnapshot
38 { 38 {
39 private Scene m_scene = null; 39 private Scene m_scene = null;
40 private DataSnapshotManager m_externalData = null; 40 private DataSnapshotManager m_externalData = null;
41 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 public DataRequestHandler(Scene scene, DataSnapshotManager externalData) 43 public DataRequestHandler(Scene scene, DataSnapshotManager externalData)
44 { 44 {
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 2dbdce6..245922c 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.DataSnapshot
48 { 48 {
49 #region Class members 49 #region Class members
50 private List<Scene> m_scenes = new List<Scene>(); 50 private List<Scene> m_scenes = new List<Scene>();
51 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 private bool m_enabled = false; 52 private bool m_enabled = false;
53 private bool m_configLoaded = false; 53 private bool m_configLoaded = false;
54 internal object m_syncInit = new object(); 54 internal object m_syncInit = new object();
diff --git a/OpenSim/Region/DataSnapshot/LandSnapshot.cs b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
index 6198e1c..b60232b 100644
--- a/OpenSim/Region/DataSnapshot/LandSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/LandSnapshot.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.DataSnapshot
45 private Scene m_scene = null; 45 private Scene m_scene = null;
46 private DataSnapshotManager m_parent = null; 46 private DataSnapshotManager m_parent = null;
47 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>(); 47 //private Dictionary<int, Land> m_landIndexed = new Dictionary<int, Land>();
48 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49 49
50 #region Dead code 50 #region Dead code
51 51
diff --git a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
index c295902..b2ef6d3 100644
--- a/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
+++ b/OpenSim/Region/DataSnapshot/ObjectSnapshot.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.DataSnapshot
37 { 37 {
38 private Scene m_scene = null; 38 private Scene m_scene = null;
39 private DataSnapshotManager m_parent = null; 39 private DataSnapshotManager m_parent = null;
40 private ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 public void Initialize(Scene scene, DataSnapshotManager parent) 42 public void Initialize(Scene scene, DataSnapshotManager parent)
43 { 43 {