aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-06-27 16:51:24 +0000
committerJustin Clarke Casey2008-06-27 16:51:24 +0000
commitba989e9fd10739d8a1092bcb252bbf72f15f06b0 (patch)
tree2792e6792341a7442f7f55f847c75adef7e788fe
parent* Remove responsibilty for signalling scene object change from SceneObjectPar... (diff)
downloadopensim-SC-ba989e9fd10739d8a1092bcb252bbf72f15f06b0.zip
opensim-SC-ba989e9fd10739d8a1092bcb252bbf72f15f06b0.tar.gz
opensim-SC-ba989e9fd10739d8a1092bcb252bbf72f15f06b0.tar.bz2
opensim-SC-ba989e9fd10739d8a1092bcb252bbf72f15f06b0.tar.xz
* restore suppression of mono addins manager warnings
-rw-r--r--OpenSim/Framework/PluginLoader.cs7
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 26df3d1..d0f9282 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -48,6 +48,7 @@ namespace OpenSim.Framework
48 { 48 {
49 suppress_console_output_ (true); 49 suppress_console_output_ (true);
50 AddinManager.Initialize (dir); 50 AddinManager.Initialize (dir);
51 AddinManager.Registry.Update (null);
51 suppress_console_output_ (false); 52 suppress_console_output_ (false);
52 } 53 }
53 54
@@ -60,9 +61,7 @@ namespace OpenSim.Framework
60 } 61 }
61 62
62 public void Load (string extpoint, Initialiser initialize) 63 public void Load (string extpoint, Initialiser initialize)
63 { 64 {
64 AddinManager.Registry.Update (null);
65
66 ExtensionNodeList ns = AddinManager.GetExtensionNodes(extpoint); 65 ExtensionNodeList ns = AddinManager.GetExtensionNodes(extpoint);
67 foreach (TypeExtensionNode n in ns) 66 foreach (TypeExtensionNode n in ns)
68 { 67 {
@@ -96,7 +95,7 @@ namespace OpenSim.Framework
96 Directory.Delete("addin-db-001", true); 95 Directory.Delete("addin-db-001", true);
97 } 96 }
98 97
99 private static TextWriter prev_console_; 98 private static TextWriter prev_console_;
100 public void suppress_console_output_ (bool save) 99 public void suppress_console_output_ (bool save)
101 { 100 {
102 if (save) 101 if (save)