From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 21:24:15 +1000 Subject: Dump OpenSim 0.9.0.1 into it's own branch. --- OpenSim/Services/Base/ServiceBase.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'OpenSim/Services/Base/ServiceBase.cs') diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs index a7eb2be..2017f50 100644 --- a/OpenSim/Services/Base/ServiceBase.cs +++ b/OpenSim/Services/Base/ServiceBase.cs @@ -26,8 +26,8 @@ */ using System; -using System.Collections.Generic; using System.IO; +using System.Collections.Generic; using System.Reflection; using log4net; using Nini.Config; @@ -38,7 +38,7 @@ namespace OpenSim.Services.Base public class ServiceBase { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + public T LoadPlugin(string dllName) where T:class { return LoadPlugin(dllName, new Object[0]); @@ -54,6 +54,7 @@ namespace OpenSim.Services.Base string noRoot = dllName.Substring(pathRoot.Length); string[] parts = noRoot.Split(new char[] {':'}); + dllName = pathRoot + parts[0]; string className = String.Empty; @@ -104,12 +105,12 @@ namespace OpenSim.Services.Base List strArgs = new List(); foreach (Object arg in args) strArgs.Add(arg.ToString()); - + m_log.Error( string.Format( - "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", + "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e); - + return null; } } -- cgit v1.1