diff options
| author | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-25 00:20:38 +0000 |
| commit | 091f3a80008a0f4a756fcb9ff4e87a24c2948c3c (patch) | |
| tree | a98354e9317e0ed6892dec344a69447c0e9c70b8 /OpenSim/Server/Base/ServerUtils.cs | |
| parent | Don't fail to enable permissions modules correctly if there is any leading or... (diff) | |
| parent | Fixed Debug command for Groups. (Use of wrong capitalization caused *two* "de... (diff) | |
| download | opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.zip opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.gz opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.bz2 opensim-SC-091f3a80008a0f4a756fcb9ff4e87a24c2948c3c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server/Base/ServerUtils.cs')
| -rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 08ba50d..c92e23c 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
| @@ -280,11 +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("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}, {3}", | 283 | m_log.Error(string.Format("[SERVER UTILS]: Error loading plugin {0} from {1}. Exception: {2}", |
| 284 | interfaceName, | 284 | interfaceName, |
| 285 | dllName, | 285 | dllName, |
| 286 | e.InnerException == null ? e.Message : e.InnerException.Message, | 286 | e.InnerException == null ? e.Message : e.InnerException.Message), |
| 287 | e.StackTrace); | 287 | e); |
| 288 | } | 288 | } |
| 289 | m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length); | 289 | m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1} args.Length {2}", dllName, e.Message, args.Length); |
| 290 | return null; | 290 | return null; |