aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Base
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/Base
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-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/Services/Base')
-rw-r--r--OpenSim/Services/Base/Properties/AssemblyInfo.cs8
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs8
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/Base/Properties/AssemblyInfo.cs b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
index 4090ef9..90c14d7 100644
--- a/OpenSim/Services/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/Base/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
2using System.Runtime.CompilerServices; 2using System.Runtime.CompilerServices;
3using System.Runtime.InteropServices; 3using System.Runtime.InteropServices;
4 4
5// General Information about an assembly is controlled through the following 5// General Information about an assembly is controlled through the following
6// set of attributes. Change these attribute values to modify the information 6// set of attributes. Change these attribute values to modify the information
7// associated with an assembly. 7// associated with an assembly.
8[assembly: AssemblyTitle("OpenSim.Services.Base")] 8[assembly: AssemblyTitle("OpenSim.Services.Base")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
14[assembly: AssemblyTrademark("")] 14[assembly: AssemblyTrademark("")]
15[assembly: AssemblyCulture("")] 15[assembly: AssemblyCulture("")]
16 16
17// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
18// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
19// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
20[assembly: ComVisible(false)] 20[assembly: ComVisible(false)]
21 21
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
25// Version information for an assembly consists of the following four values: 25// Version information for an assembly consists of the following four values:
26// 26//
27// Major Version 27// Major Version
28// Minor Version 28// Minor Version
29// Build Number 29// Build Number
30// Revision 30// Revision
31// 31//
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 209a57a..2017f50 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Services.Base
38 public class ServiceBase 38 public class ServiceBase
39 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 public T LoadPlugin<T>(string dllName) where T:class 42 public T LoadPlugin<T>(string dllName) where T:class
43 { 43 {
44 return LoadPlugin<T>(dllName, new Object[0]); 44 return LoadPlugin<T>(dllName, new Object[0]);
@@ -105,12 +105,12 @@ namespace OpenSim.Services.Base
105 List<string> strArgs = new List<string>(); 105 List<string> strArgs = new List<string>();
106 foreach (Object arg in args) 106 foreach (Object arg in args)
107 strArgs.Add(arg.ToString()); 107 strArgs.Add(arg.ToString());
108 108
109 m_log.Error( 109 m_log.Error(
110 string.Format( 110 string.Format(
111 "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}", 111 "[SERVICE BASE]: Failed to load plugin {0} from {1} with args {2}",
112 interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e); 112 interfaceName, dllName, string.Join(", ", strArgs.ToArray())), e);
113 113
114 return null; 114 return null;
115 } 115 }
116 } 116 }