diff options
author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Services/Base/ServiceBase.cs | |
parent | remove lixo (diff) | |
parent | dont change camera on crossings (diff) | |
download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz |
bad merge?
Diffstat (limited to 'OpenSim/Services/Base/ServiceBase.cs')
-rw-r--r-- | OpenSim/Services/Base/ServiceBase.cs | 7 |
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 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | ||
29 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
30 | using System.IO; | 31 | using System.IO; |
31 | using System.Reflection; | 32 | using 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 | ||