Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 9 insertions, 8 deletions

diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index 819cb7b..d12aa61 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -215,12 +215,12 @@ namespace OpenSim.Framework
             AddinManager.AddinLoadError += on_addinloaderror_;
             AddinManager.AddinLoaded += on_addinloaded_;
 
-            clear_registry_();
+            //clear_registry_(dir);
 
-            suppress_console_output_(true);
+            //suppress_console_output_(true);
             AddinManager.Initialize(dir);
             AddinManager.Registry.Update(null);
-            suppress_console_output_(false);
+            //suppress_console_output_(false);
         }
 
         private void on_addinloaded_(object sender, AddinEventArgs args)
@@ -239,18 +239,19 @@ namespace OpenSim.Framework
                         + args.Exception.StackTrace);
         }
 
-        private void clear_registry_()
+        private void clear_registry_(string dir)
         {
             // The Mono addin manager (in Mono.Addins.dll version 0.2.0.0)
             // occasionally seems to corrupt its addin cache
             // Hence, as a temporary solution we'll remove it before each startup
+
             try
             {
-                if (Directory.Exists("addin-db-000"))
-                    Directory.Delete("addin-db-000", true);
+                if (Directory.Exists(dir + "/addin-db-000"))
+                    Directory.Delete(dir + "/addin-db-000", true);
 
-                if (Directory.Exists("addin-db-001"))
-                    Directory.Delete("addin-db-001", true);
+                if (Directory.Exists(dir + "/addin-db-001"))
+                    Directory.Delete(dir + "/addin-db-001", true);
             }
             catch (IOException)
             {