diff options
author | Mic Bowman | 2012-04-17 14:15:17 -0700 |
---|---|---|
committer | Mic Bowman | 2012-04-17 14:15:17 -0700 |
commit | 4db518b9a30122f662a40252d3674ea272d6dcc1 (patch) | |
tree | 60e263a91db38f35d70aee7f588ac33159ffc435 /OpenSim/Region | |
parent | add configuration for jsonstore module, disabled by default (diff) | |
download | opensim-SC-4db518b9a30122f662a40252d3674ea272d6dcc1.zip opensim-SC-4db518b9a30122f662a40252d3674ea272d6dcc1.tar.gz opensim-SC-4db518b9a30122f662a40252d3674ea272d6dcc1.tar.bz2 opensim-SC-4db518b9a30122f662a40252d3674ea272d6dcc1.tar.xz |
Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
Cut down on the logging spam.
Diffstat (limited to 'OpenSim/Region')
3 files changed, 7 insertions, 5 deletions
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 | |||
74 | /// | 74 | /// |
75 | /// </summary> | 75 | /// </summary> |
76 | // ----------------------------------------------------------------- | 76 | // ----------------------------------------------------------------- |
77 | public JsonStore(string value = "") | 77 | public JsonStore() : this("") {} |
78 | |||
79 | public JsonStore(string value) | ||
78 | { | 80 | { |
79 | m_TakeStore = new List<TakeValueCallbackClass>(); | 81 | m_TakeStore = new List<TakeValueCallbackClass>(); |
80 | m_ReadStore = new List<TakeValueCallbackClass>(); | 82 | 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 | |||
85 | if ((m_config = config.Configs["JsonStore"]) == null) | 85 | if ((m_config = config.Configs["JsonStore"]) == null) |
86 | { | 86 | { |
87 | // There is no configuration, the module is disabled | 87 | // There is no configuration, the module is disabled |
88 | m_log.InfoFormat("[JsonStore] no configuration info"); | 88 | // m_log.InfoFormat("[JsonStore] no configuration info"); |
89 | return; | 89 | return; |
90 | } | 90 | } |
91 | 91 | ||
@@ -97,7 +97,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
97 | return; | 97 | return; |
98 | } | 98 | } |
99 | 99 | ||
100 | m_log.InfoFormat("[JsonStore] module {0} enabled",(m_enabled ? "is" : "is not")); | 100 | m_log.DebugFormat("[JsonStore] module {0} enabled",(m_enabled ? "is" : "is not")); |
101 | } | 101 | } |
102 | 102 | ||
103 | // ----------------------------------------------------------------- | 103 | // ----------------------------------------------------------------- |
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 | |||
84 | if ((m_config = config.Configs["JsonStore"]) == null) | 84 | if ((m_config = config.Configs["JsonStore"]) == null) |
85 | { | 85 | { |
86 | // There is no configuration, the module is disabled | 86 | // There is no configuration, the module is disabled |
87 | m_log.InfoFormat("[JsonStoreScripts] no configuration info"); | 87 | // m_log.InfoFormat("[JsonStoreScripts] no configuration info"); |
88 | return; | 88 | return; |
89 | } | 89 | } |
90 | 90 | ||
@@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore | |||
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | 98 | ||
99 | m_log.InfoFormat("[JsonStoreScripts] module {0} enabled",(m_enabled ? "is" : "is not")); | 99 | m_log.DebugFormat("[JsonStoreScripts] module {0} enabled",(m_enabled ? "is" : "is not")); |
100 | } | 100 | } |
101 | 101 | ||
102 | // ----------------------------------------------------------------- | 102 | // ----------------------------------------------------------------- |