2 files changed, 13 insertions, 2 deletions

diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
index 959670c..a3fb11b 100644
--- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]
 
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 22f27e0..09dcbef 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -28,6 +28,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -46,9 +47,19 @@ namespace OpenSim.Services.Base
 
         public T LoadPlugin<T>(string dllName, Object[] args) where T:class
         {
+<<<<<<< HEAD
+            // The path:type separator : is unfortunate because it collides
+            // with Windows paths like C:\...
+            // When the path provided includes the drive, this fails.
+            // Hence the root/noroot thing going on here.
+            string pathRoot = Path.GetPathRoot(dllName);
+            string noRoot = dllName.Substring(pathRoot.Length);
+            string[] parts = noRoot.Split(new char[] {':'});
+=======
             string pathRoot = Path.GetPathRoot(dllName);
             string noRoot = dllName.Substring(pathRoot.Length);
             string[] parts = noRoot.Split(new char[] { ':' });
+>>>>>>> avn/ubitvar
 
             dllName = pathRoot + parts[0];
 
@@ -82,7 +93,7 @@ namespace OpenSim.Services.Base
                             continue;
 
                         Type typeInterface =
-                                pluginType.GetInterface(interfaceName, true);
+                                pluginType.GetInterface(interfaceName);
                         if (typeInterface != null)
                         {
                             T plug = (T)Activator.CreateInstance(pluginType,