Merge branch 'master' into careminster-presence-refactor

1 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index 0cebff5..8db8064 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -38,9 +38,9 @@ namespace OpenSim.Data.Null
 {
     public class NullEstateStore : IEstateDataStore
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private string m_connectionString;
+//        private string m_connectionString;
 
         protected virtual Assembly Assembly
         {
@@ -58,7 +58,7 @@ namespace OpenSim.Data.Null
 
         public void Initialise(string connectionString)
         {
-            m_connectionString = connectionString;
+//            m_connectionString = connectionString;
         }
 
         private string[] FieldList