aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Base
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Base/Properties/AssemblyInfo.cs10
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs11
2 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
index b113c42..90c14d7 100644
--- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Services.Base")] 8[assembly: AssemblyTitle("OpenSim.Services.Base")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
32[assembly: AssemblyVersion("0.8.3.*")] 32[assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)]
33 33
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 }