diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Server/Base/ServerUtils.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Server/Base/ServerUtils.cs')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 57d0a8d..b17d7ba 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -104,7 +104,7 @@ namespace OpenSim.Server.Base | |||
104 | // libomv, which has a hard-coded path to "." for pinvoke | 104 | // libomv, which has a hard-coded path to "." for pinvoke |
105 | // to load the openjpeg dll | 105 | // to load the openjpeg dll |
106 | // | 106 | // |
107 | // Will look for a way to fix, but for now this keeps the | 107 | // Will look for a way to fix, but for now this keeps the |
108 | // confusion to a minimum. this was copied from our region | 108 | // confusion to a minimum. this was copied from our region |
109 | // plugin loader, we have been doing this in there for a long time. | 109 | // plugin loader, we have been doing this in there for a long time. |
110 | // | 110 | // |
@@ -183,7 +183,7 @@ namespace OpenSim.Server.Base | |||
183 | 183 | ||
184 | if(port != 0) | 184 | if(port != 0) |
185 | server = MainServer.GetHttpServer(port); | 185 | server = MainServer.GetHttpServer(port); |
186 | else | 186 | else |
187 | server = MainServer.Instance; | 187 | server = MainServer.Instance; |
188 | 188 | ||
189 | return server; | 189 | return server; |
@@ -222,19 +222,19 @@ namespace OpenSim.Server.Base | |||
222 | // This is good to debug configuration problems | 222 | // This is good to debug configuration problems |
223 | //if (dllName == string.Empty) | 223 | //if (dllName == string.Empty) |
224 | // Util.PrintCallStack(); | 224 | // Util.PrintCallStack(); |
225 | 225 | ||
226 | string className = String.Empty; | 226 | string className = String.Empty; |
227 | 227 | ||
228 | // The path for a dynamic plugin will contain ":" on Windows | 228 | // The path for a dynamic plugin will contain ":" on Windows |
229 | string[] parts = dllName.Split (new char[] {':'}); | 229 | string[] parts = dllName.Split (new char[] {':'}); |
230 | 230 | ||
231 | if (parts [0].Length > 1) | 231 | if (parts [0].Length > 1) |
232 | { | 232 | { |
233 | dllName = parts [0]; | 233 | dllName = parts [0]; |
234 | if (parts.Length > 1) | 234 | if (parts.Length > 1) |
235 | className = parts[1]; | 235 | className = parts[1]; |
236 | } | 236 | } |
237 | else | 237 | else |
238 | { | 238 | { |
239 | // This is Windows - we must replace the ":" in the path | 239 | // This is Windows - we must replace the ":" in the path |
240 | dllName = String.Format ("{0}:{1}", parts [0], parts [1]); | 240 | dllName = String.Format ("{0}:{1}", parts [0], parts [1]); |
@@ -242,17 +242,17 @@ namespace OpenSim.Server.Base | |||
242 | className = parts[2]; | 242 | className = parts[2]; |
243 | } | 243 | } |
244 | 244 | ||
245 | // Handle extra string arguments in a more generic way | 245 | // Handle extra string arguments in a more generic way |
246 | if (dllName.Contains("@")) | 246 | if (dllName.Contains("@")) |
247 | { | 247 | { |
248 | string[] dllNameParts = dllName.Split(new char[] {'@'}); | 248 | string[] dllNameParts = dllName.Split(new char[] {'@'}); |
249 | dllName = dllNameParts[dllNameParts.Length - 1]; | 249 | dllName = dllNameParts[dllNameParts.Length - 1]; |
250 | List<Object> argList = new List<Object>(args); | 250 | List<Object> argList = new List<Object>(args); |
251 | for (int i = 0 ; i < dllNameParts.Length - 1 ; ++i) | 251 | for (int i = 0 ; i < dllNameParts.Length - 1 ; ++i) |
252 | argList.Add(dllNameParts[i]); | 252 | argList.Add(dllNameParts[i]); |
253 | 253 | ||
254 | args = argList.ToArray(); | 254 | args = argList.ToArray(); |
255 | } | 255 | } |
256 | 256 | ||
257 | return LoadPlugin<T>(dllName, className, args); | 257 | return LoadPlugin<T>(dllName, className, args); |
258 | } | 258 | } |
@@ -276,10 +276,10 @@ namespace OpenSim.Server.Base | |||
276 | { | 276 | { |
277 | if (pluginType.IsPublic) | 277 | if (pluginType.IsPublic) |
278 | { | 278 | { |
279 | if (className != String.Empty | 279 | if (className != String.Empty |
280 | && pluginType.ToString() != pluginType.Namespace + "." + className) | 280 | && pluginType.ToString() != pluginType.Namespace + "." + className) |
281 | continue; | 281 | continue; |
282 | 282 | ||
283 | Type typeInterface = pluginType.GetInterface(interfaceName); | 283 | Type typeInterface = pluginType.GetInterface(interfaceName); |
284 | 284 | ||
285 | if (typeInterface != null) | 285 | if (typeInterface != null) |
@@ -295,8 +295,8 @@ namespace OpenSim.Server.Base | |||
295 | if (!(e is System.MissingMethodException)) | 295 | if (!(e is System.MissingMethodException)) |
296 | { | 296 | { |
297 | m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}", | 297 | m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}", |
298 | interfaceName, | 298 | interfaceName, |
299 | dllName, | 299 | dllName, |
300 | e.InnerException == null ? e.Message : e.InnerException.Message), | 300 | e.InnerException == null ? e.Message : e.InnerException.Message), |
301 | e); | 301 | e); |
302 | } | 302 | } |
@@ -479,7 +479,7 @@ namespace OpenSim.Server.Base | |||
479 | XmlDocument doc = new XmlDocument(); | 479 | XmlDocument doc = new XmlDocument(); |
480 | 480 | ||
481 | doc.LoadXml(data); | 481 | doc.LoadXml(data); |
482 | 482 | ||
483 | XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse"); | 483 | XmlNodeList rootL = doc.GetElementsByTagName("ServerResponse"); |
484 | 484 | ||
485 | if (rootL.Count != 1) | 485 | if (rootL.Count != 1) |