From 6f002733b1079e8b7bd9ea7a3750348c9bac88ea Mon Sep 17 00:00:00 2001 From: BlueWall Date: Thu, 13 Dec 2012 13:38:57 -0500 Subject: Fix formatting --- OpenSim/Server/Base/ServerUtils.cs | 45 ++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'OpenSim/Server') diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index d6d3957..3f208bf 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs @@ -139,7 +139,7 @@ namespace OpenSim.Server.Base if (a.AddinFile.Contains(Registry.DefaultAddinsFolder)) { m_log.InfoFormat("[SERVER]: Adding {0} from registry", a.Name); - connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); } + connector.PluginPath = System.IO.Path.Combine(Registry.DefaultAddinsFolder,a.Name.Replace(',', '.')); } else { m_log.InfoFormat("[SERVER]: Adding {0} from ./bin", a.Name); @@ -216,26 +216,29 @@ namespace OpenSim.Server.Base /// The arguments which control which constructor is invoked on the plugin /// public static T LoadPlugin (string dllName, Object[] args) where T:class - { - // This is good to debug configuration problems - //if (dllName == string.Empty) - // Util.PrintCallStack(); - - 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) - 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]; - } + { + // This is good to debug configuration problems + //if (dllName == string.Empty) + // Util.PrintCallStack(); + + 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) + 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(dllName, className, args); } -- cgit v1.1