diff options
| author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
| commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
| tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Server/Base/ServerUtils.cs | |
| parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.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 | 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 | ||