aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Base/ServiceBase.cs
diff options
context:
space:
mode:
authoronefang2019-09-11 16:36:50 +1000
committeronefang2019-09-11 16:36:50 +1000
commit50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch)
tree52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Services/Base/ServiceBase.cs
parentRenamed branch to SledjChisl. (diff)
parentBump to release flavour, build 0. (diff)
downloadopensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Services/Base/ServiceBase.cs')
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs11
1 files changed, 6 insertions, 5 deletions
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 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.IO; 29using System.IO;
30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using log4net; 32using log4net;
33using Nini.Config; 33using Nini.Config;
@@ -38,7 +38,7 @@ namespace OpenSim.Services.Base
38 public class ServiceBase 38 public class ServiceBase
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 public T LoadPlugin<T>(string dllName) where T:class 42 public T LoadPlugin<T>(string dllName) where T:class
43 { 43 {
44 return LoadPlugin<T>(dllName, new Object[0]); 44 return LoadPlugin<T>(dllName, new Object[0]);
@@ -54,6 +54,7 @@ namespace OpenSim.Services.Base
54 string noRoot = dllName.Substring(pathRoot.Length); 54 string noRoot = dllName.Substring(pathRoot.Length);
55 string[] parts = noRoot.Split(new char[] {':'}); 55 string[] parts = noRoot.Split(new char[] {':'});
56 56
57
57 dllName = pathRoot + parts[0]; 58 dllName = pathRoot + parts[0];
58 59
59 string className = String.Empty; 60 string className = String.Empty;
@@ -104,12 +105,12 @@ namespace OpenSim.Services.Base
104 List<string> strArgs = new List<string>(); 105 List<string> strArgs = new List<string>();
105 foreach (Object arg in args) 106 foreach (Object arg in args)
106 strArgs.Add(arg.ToString()); 107 strArgs.Add(arg.ToString());
107 108
108 m_log.Error( 109 m_log.Error(
109 string.Format( 110 string.Format(
110 "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", 111 "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}",
111 interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e); 112 interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e);
112 113
113 return null; 114 return null;
114 } 115 }
115 } 116 }