aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorBlueWall2013-01-15 10:08:27 -0500
committerBlueWall2013-01-15 10:08:27 -0500
commitf54b398540698e6e09022fe77b6405624b532f5c (patch)
tree74581e7176d06dd8e2bff43720a3033ccfe6df0e /OpenSim/Server
parentAdd Json-Rpc 2.0 To Registered Handlers (diff)
parentBulletSim: tweeks to improve hover. (diff)
downloadopensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.zip
opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.gz
opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.bz2
opensim-SC-f54b398540698e6e09022fe77b6405624b532f5c.tar.xz
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 3f208bf..2e6d279 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -280,8 +280,11 @@ namespace OpenSim.Server.Base
280 { 280 {
281 if (!(e is System.MissingMethodException)) 281 if (!(e is System.MissingMethodException))
282 { 282 {
283 m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}", 283 m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}, {3}",
284 interfaceName, dllName, e.InnerException == null ? e.Message : e.InnerException.Message); 284 interfaceName,
285 dllName,
286 e.InnerException == null ? e.Message : e.InnerException.Message,
287 e.StackTrace);
285 } 288 }
286 return null; 289 return null;
287 } 290 }