diff options
Diffstat (limited to 'OpenSim/Services/Base')
-rw-r--r-- | OpenSim/Services/Base/Properties/AssemblyInfo.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/Base/ServiceBase.cs | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs index 306b699..b113c42 100644 --- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs | |||
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.8.3.*")] |
33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | |
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs index ef30cba..a7eb2be 100644 --- a/OpenSim/Services/Base/ServiceBase.cs +++ b/OpenSim/Services/Base/ServiceBase.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | ||
30 | using System.Reflection; | 31 | using System.Reflection; |
31 | using log4net; | 32 | using log4net; |
32 | using Nini.Config; | 33 | using Nini.Config; |
@@ -45,9 +46,15 @@ namespace OpenSim.Services.Base | |||
45 | 46 | ||
46 | public T LoadPlugin<T>(string dllName, Object[] args) where T:class | 47 | public T LoadPlugin<T>(string dllName, Object[] args) where T:class |
47 | { | 48 | { |
48 | string[] parts = dllName.Split(new char[] {':'}); | 49 | // The path:type separator : is unfortunate because it collides |
50 | // with Windows paths like C:\... | ||
51 | // When the path provided includes the drive, this fails. | ||
52 | // Hence the root/noroot thing going on here. | ||
53 | string pathRoot = Path.GetPathRoot(dllName); | ||
54 | string noRoot = dllName.Substring(pathRoot.Length); | ||
55 | string[] parts = noRoot.Split(new char[] {':'}); | ||
49 | 56 | ||
50 | dllName = parts[0]; | 57 | dllName = pathRoot + parts[0]; |
51 | 58 | ||
52 | string className = String.Empty; | 59 | string className = String.Empty; |
53 | 60 | ||
@@ -79,7 +86,7 @@ namespace OpenSim.Services.Base | |||
79 | continue; | 86 | continue; |
80 | 87 | ||
81 | Type typeInterface = | 88 | Type typeInterface = |
82 | pluginType.GetInterface(interfaceName, true); | 89 | pluginType.GetInterface(interfaceName); |
83 | if (typeInterface != null) | 90 | if (typeInterface != null) |
84 | { | 91 | { |
85 | T plug = (T)Activator.CreateInstance(pluginType, | 92 | T plug = (T)Activator.CreateInstance(pluginType, |