1 files changed, 13 insertions, 4 deletions

diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs
index d12aa61..1e5e8bf 100644
--- a/OpenSim/Framework/PluginLoader.cs
+++ b/OpenSim/Framework/PluginLoader.cs
@@ -245,13 +245,22 @@ namespace OpenSim.Framework
             // occasionally seems to corrupt its addin cache
             // Hence, as a temporary solution we'll remove it before each startup
 
+            string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
+            string v0 = "addin-db-000";
+            string v1 = "addin-db-001";
+            if (customDir != null && customDir != String.Empty)
+            {
+                v0 = Path.Combine(customDir, v0);
+                v1 = Path.Combine(customDir, v1);
+            }
             try
             {
-                if (Directory.Exists(dir + "/addin-db-000"))
-                    Directory.Delete(dir + "/addin-db-000", true);
+                if (Directory.Exists(v0))
+                    Directory.Delete(v0, true);
+
+                if (Directory.Exists(v1))
+                    Directory.Delete(v1, true);
 
-                if (Directory.Exists(dir + "/addin-db-001"))
-                    Directory.Delete(dir + "/addin-db-001", true);
             }
             catch (IOException)
             {