aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Base
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services/Base')
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index a7eb2be..09dcbef 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.IO;
29using System.Collections.Generic; 30using System.Collections.Generic;
30using System.IO; 31using System.IO;
31using System.Reflection; 32using System.Reflection;
@@ -46,6 +47,7 @@ namespace OpenSim.Services.Base
46 47
47 public T LoadPlugin<T>(string dllName, Object[] args) where T:class 48 public T LoadPlugin<T>(string dllName, Object[] args) where T:class
48 { 49 {
50<<<<<<< HEAD
49 // The path:type separator : is unfortunate because it collides 51 // The path:type separator : is unfortunate because it collides
50 // with Windows paths like C:\... 52 // with Windows paths like C:\...
51 // When the path provided includes the drive, this fails. 53 // When the path provided includes the drive, this fails.
@@ -53,6 +55,11 @@ namespace OpenSim.Services.Base
53 string pathRoot = Path.GetPathRoot(dllName); 55 string pathRoot = Path.GetPathRoot(dllName);
54 string noRoot = dllName.Substring(pathRoot.Length); 56 string noRoot = dllName.Substring(pathRoot.Length);
55 string[] parts = noRoot.Split(new char[] {':'}); 57 string[] parts = noRoot.Split(new char[] {':'});
58=======
59 string pathRoot = Path.GetPathRoot(dllName);
60 string noRoot = dllName.Substring(pathRoot.Length);
61 string[] parts = noRoot.Split(new char[] { ':' });
62>>>>>>> avn/ubitvar
56 63
57 dllName = pathRoot + parts[0]; 64 dllName = pathRoot + parts[0];
58 65