OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix module pathname handling for Windows

0.7.5-pf-bulletsim
BlueWall (James Hughes) 2012-12-13 13:13:40 -05:00 committed by BlueWall
parent 203b492fce
commit 5f11b4658e
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Server/Base/ServerUtils.cs
View File

@ -139,8 +139,7 @@ namespace OpenSim.Server.Base
if (a.AddinFile.Contains(Registry.DefaultAddinsFolder)) if (a.AddinFile.Contains(Registry.DefaultAddinsFolder))
{ {
m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name); m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name);
connector.PluginPath = String.Format("{0}/{1}", Registry.DefaultAddinsFolder, a.Name.Replace(',', '.')); connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); }
}
else else
{ {
m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name); m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name);
@ -216,20 +215,27 @@ namespace OpenSim.Server.Base
/// <param name="dllName"></param> /// <param name="dllName"></param>
/// <param name="args">The arguments which control which constructor is invoked on the plugin</param> /// <param name="args">The arguments which control which constructor is invoked on the plugin</param>
/// <returns></returns> /// <returns></returns>
public static T LoadPlugin<T>(string dllName, Object[] args) where T:class public static T LoadPlugin<T> (string dllName, Object[] args) where T:class
{ {
// This is good to debug configuration problems // This is good to debug configuration problems
//if (dllName == string.Empty) //if (dllName == string.Empty)
// Util.PrintCallStack(); // Util.PrintCallStack();
string[] parts = dllName.Split(new char[] {':'});
dllName = parts[0];
string className = String.Empty; string className = String.Empty;
// The path for a dynamic plugin will contain ":" on Windows
string[] parts = dllName.Split (new char[] {':'});
if (parts [0].Length > 1) {
dllName = parts [0];
if (parts.Length > 1) if (parts.Length > 1)
className = parts[1]; className = parts[1];
} else {
// This is Windows - we must replace the ":" in the path
dllName = String.Format ("{0}:{1}", parts [0], parts [1]);
if (parts.Length > 2)
className = parts[2];
}
return LoadPlugin<T>(dllName, className, args); return LoadPlugin<T>(dllName, className, args);
} }