diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Framework/PluginLoader.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Framework/PluginLoader.cs')
-rw-r--r-- | OpenSim/Framework/PluginLoader.cs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs index 5fa27d6..1e5e8bf 100644 --- a/OpenSim/Framework/PluginLoader.cs +++ b/OpenSim/Framework/PluginLoader.cs | |||
@@ -245,15 +245,6 @@ namespace OpenSim.Framework | |||
245 | // occasionally seems to corrupt its addin cache | 245 | // occasionally seems to corrupt its addin cache |
246 | // Hence, as a temporary solution we'll remove it before each startup | 246 | // Hence, as a temporary solution we'll remove it before each startup |
247 | 247 | ||
248 | <<<<<<< HEAD | ||
249 | try | ||
250 | { | ||
251 | if (Directory.Exists(dir + "/addin-db-000")) | ||
252 | Directory.Delete(dir + "/addin-db-000", true); | ||
253 | |||
254 | if (Directory.Exists(dir + "/addin-db-001")) | ||
255 | Directory.Delete(dir + "/addin-db-001", true); | ||
256 | ======= | ||
257 | string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY"); | 248 | string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY"); |
258 | string v0 = "addin-db-000"; | 249 | string v0 = "addin-db-000"; |
259 | string v1 = "addin-db-001"; | 250 | string v1 = "addin-db-001"; |
@@ -269,7 +260,7 @@ namespace OpenSim.Framework | |||
269 | 260 | ||
270 | if (Directory.Exists(v1)) | 261 | if (Directory.Exists(v1)) |
271 | Directory.Delete(v1, true); | 262 | Directory.Delete(v1, true); |
272 | >>>>>>> avn/ubitvar | 263 | |
273 | } | 264 | } |
274 | catch (IOException) | 265 | catch (IOException) |
275 | { | 266 | { |