From 4db518b9a30122f662a40252d3674ea272d6dcc1 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 17 Apr 2012 14:15:17 -0700
Subject: Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization. Cut
 down on the logging spam.

---
 OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs       | 4 +++-
 OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs | 4 ++--
 .../OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs      | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
index 49556b6..34894ba 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -74,7 +74,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// 
         /// </summary>
         // -----------------------------------------------------------------
-        public JsonStore(string value = "")
+        public JsonStore() : this("") {}
+        
+        public JsonStore(string value)
         {
             m_TakeStore = new List<TakeValueCallbackClass>();
             m_ReadStore = new List<TakeValueCallbackClass>();
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index 6dae956..26bc615 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -85,7 +85,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 if ((m_config = config.Configs["JsonStore"]) == null)
                 {
                     // There is no configuration, the module is disabled
-                    m_log.InfoFormat("[JsonStore] no configuration info");
+                    // m_log.InfoFormat("[JsonStore] no configuration info");
                     return;
                 }
 
@@ -97,7 +97,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 return;
             }
 
-            m_log.InfoFormat("[JsonStore] module {0} enabled",(m_enabled ? "is" : "is not"));
+            m_log.DebugFormat("[JsonStore] module {0} enabled",(m_enabled ? "is" : "is not"));
         }
 
         // -----------------------------------------------------------------
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index 7aba860..c619d0d 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 if ((m_config = config.Configs["JsonStore"]) == null)
                 {
                     // There is no configuration, the module is disabled
-                    m_log.InfoFormat("[JsonStoreScripts] no configuration info");
+                    // m_log.InfoFormat("[JsonStoreScripts] no configuration info");
                     return;
                 }
 
@@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 return;
             }
 
-            m_log.InfoFormat("[JsonStoreScripts] module {0} enabled",(m_enabled ? "is" : "is not"));
+            m_log.DebugFormat("[JsonStoreScripts] module {0} enabled",(m_enabled ? "is" : "is not"));
         }
 
         // -----------------------------------------------------------------
-- 
cgit v1.1