aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index ae0c3d4..d827b86 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -31,11 +31,14 @@ using System.Reflection;
31using System.Xml; 31using System.Xml;
32using System.Xml.Serialization; 32using System.Xml.Serialization;
33using System.Text; 33using System.Text;
34using log4net;
34 35
35namespace OpenSim.Server.Base 36namespace OpenSim.Server.Base
36{ 37{
37 public static class ServerUtils 38 public static class ServerUtils
38 { 39 {
40 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41
39 public static string SLAssetTypeToContentType(int assetType) 42 public static string SLAssetTypeToContentType(int assetType)
40 { 43 {
41 switch (assetType) 44 switch (assetType)
@@ -114,6 +117,9 @@ namespace OpenSim.Server.Base
114 117
115 try 118 try
116 { 119 {
120 //m_log.DebugFormat("[PLUGINS]: Loading plugins from {0}", System.IO.Directory.GetCurrentDirectory());
121 //m_log.DebugFormat("[PLUGINS]: Trying to load {0}", dllName);
122
117 Assembly pluginAssembly = Assembly.LoadFrom(dllName); 123 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
118 124
119 foreach (Type pluginType in pluginAssembly.GetTypes()) 125 foreach (Type pluginType in pluginAssembly.GetTypes())
@@ -141,6 +147,7 @@ namespace OpenSim.Server.Base
141 } 147 }
142 catch (Exception e) 148 catch (Exception e)
143 { 149 {
150 m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e);
144 return null; 151 return null;
145 } 152 }
146 } 153 }