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

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
*/
using System;
using System.IO;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
@@ -46,6 +47,7 @@ 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.
@@ -53,6 +55,11 @@ 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];