diff options
author | Melanie | 2013-04-29 00:38:20 +0100 |
---|---|---|
committer | Melanie | 2013-04-29 00:38:20 +0100 |
commit | 7c729e1519add75bd11b998b5d1709d351d82d29 (patch) | |
tree | 1069522b2d63041966d9b66b399fa94597a38d51 /OpenSim/Server | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Fix wrong sql statement in offline im. (diff) | |
download | opensim-SC_OLD-7c729e1519add75bd11b998b5d1709d351d82d29.zip opensim-SC_OLD-7c729e1519add75bd11b998b5d1709d351d82d29.tar.gz opensim-SC_OLD-7c729e1519add75bd11b998b5d1709d351d82d29.tar.bz2 opensim-SC_OLD-7c729e1519add75bd11b998b5d1709d351d82d29.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 210a314..25957d3 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -286,6 +286,7 @@ namespace OpenSim.Server.Base | |||
286 | e.InnerException == null ? e.Message : e.InnerException.Message, | 286 | e.InnerException == null ? e.Message : e.InnerException.Message, |
287 | e.StackTrace); | 287 | e.StackTrace); |
288 | } | 288 | } |
289 | m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1}", dllName, e.Message); | ||
289 | return null; | 290 | return null; |
290 | } | 291 | } |
291 | 292 | ||