OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix in LoadPLugin so that it can take paths to dlls that look like this "C:\foo\MyDll.dll:MyType" -- the split on : was messing things up.

sedebug
Diva Canto 2015-01-02 09:16:39 -08:00
parent 7d1c59b8e3
commit bd2ec3edf5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Reflection; using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
@ -45,9 +46,15 @@ namespace OpenSim.Services.Base
public T LoadPlugin<T>(string dllName, Object[] args) where T:class public T LoadPlugin<T>(string dllName, Object[] args) where T:class
{ {
string[] parts = dllName.Split(new char[] {':'}); // The path:type separator : is unfortunate because it collides
// with Windows paths like C:\...
// When the path provided includes the drive, this fails.
// Hence the root/noroot thing going on here.
string pathRoot = Path.GetPathRoot(dllName);
string noRoot = dllName.Substring(pathRoot.Length);
string[] parts = noRoot.Split(new char[] {':'});
dllName = parts[0]; dllName = pathRoot + parts[0];
string className = String.Empty; string className = String.Empty;