ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +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

7
OpenSim/Services/Base/ServiceBase.cs
View File

@@ -47,7 +47,6 @@ namespace OpenSim.Services.Base
public T LoadPlugin<T>(string dllName, Object[] args) where T:class
{
<<<<<<< HEAD
// The path:type separator : is unfortunate because it collides
// with Windows paths like C:\...
// When the path provided includes the drive, this fails.
@@ -55,11 +54,7 @@ namespace OpenSim.Services.Base
string pathRoot = Path.GetPathRoot(dllName);
string noRoot = dllName.Substring(pathRoot.Length);
string[] parts = noRoot.Split(new char[] {':'});
=======
string pathRoot = Path.GetPathRoot(dllName);
string noRoot = dllName.Substring(pathRoot.Length);
string[] parts = noRoot.Split(new char[] { ':' });
>>>>>>> avn/ubitvar
dllName = pathRoot + parts[0];