diff options
author | Melanie | 2012-04-25 01:22:09 +0100 |
---|---|---|
committer | Melanie | 2012-04-25 01:22:09 +0100 |
commit | def65cd94a18115d1a9cb89d735715c1f708a81d (patch) | |
tree | 7fd2c4c5ebb563bf7225d244b80739e9df134566 /OpenSim/Server | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Comment out some debug ATTACHMENTS log messages for now. (diff) | |
download | opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.zip opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.gz opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.bz2 opensim-SC_OLD-def65cd94a18115d1a9cb89d735715c1f708a81d.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index 8effdd2..0cc2a4b 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
@@ -117,7 +117,10 @@ namespace OpenSim.Server.Base | |||
117 | catch (Exception e) | 117 | catch (Exception e) |
118 | { | 118 | { |
119 | if (!(e is System.MissingMethodException)) | 119 | if (!(e is System.MissingMethodException)) |
120 | m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException); | 120 | { |
121 | m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}", | ||
122 | interfaceName, dllName, e.InnerException == null ? e.Message : e.InnerException.Message); | ||
123 | } | ||
121 | return null; | 124 | return null; |
122 | } | 125 | } |
123 | 126 | ||