ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Framework/PluginLoader.cs
View File

@@ -245,15 +245,6 @@ namespace OpenSim.Framework
// occasionally seems to corrupt its addin cache
// Hence, as a temporary solution we'll remove it before each startup
<<<<<<< HEAD
try
{
if (Directory.Exists(dir + "/addin-db-000"))
Directory.Delete(dir + "/addin-db-000", true);
if (Directory.Exists(dir + "/addin-db-001"))
Directory.Delete(dir + "/addin-db-001", true);
=======
string customDir = Environment.GetEnvironmentVariable ("MONO_ADDINS_REGISTRY");
string v0 = "addin-db-000";
string v1 = "addin-db-001";
@@ -269,7 +260,7 @@ namespace OpenSim.Framework
if (Directory.Exists(v1))
Directory.Delete(v1, true);
>>>>>>> avn/ubitvar
}
catch (IOException)
{