diff options
| author | Mic Bowman | 2011-04-12 12:38:47 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-12 12:38:47 -0700 |
| commit | 0e97629ee7b24ede98983ad5cebc590fc0b7b74f (patch) | |
| tree | 51f38b9ad75a09ce70ef00df9717444aa1e670f7 /OpenSim/Region/Framework | |
| parent | New tokenbucket algorithm. This one provides fair sharing of the queues (diff) | |
| parent | minor: add a bit more method doc to IInventoryService.GetItem() (diff) | |
| download | opensim-SC-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.zip opensim-SC-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.tar.gz opensim-SC-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.tar.bz2 opensim-SC-0e97629ee7b24ede98983ad5cebc590fc0b7b74f.tar.xz | |
Merge branch 'master' into queuetest
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/ModuleLoader.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/ModuleLoader.cs b/OpenSim/Region/Framework/ModuleLoader.cs index 23be9c2..14ecd44 100644 --- a/OpenSim/Region/Framework/ModuleLoader.cs +++ b/OpenSim/Region/Framework/ModuleLoader.cs | |||
| @@ -223,7 +223,8 @@ namespace OpenSim.Region.Framework | |||
| 223 | catch (Exception e) | 223 | catch (Exception e) |
| 224 | { | 224 | { |
| 225 | m_log.ErrorFormat( | 225 | m_log.ErrorFormat( |
| 226 | "[MODULES]: Could not load types for [{0}]. Exception {1}", pluginAssembly.FullName, e); | 226 | "[MODULES]: Could not load types for plugin DLL {0}. Exception {1} {2}", |
| 227 | pluginAssembly.FullName, e.Message, e.StackTrace); | ||
| 227 | 228 | ||
| 228 | // justincc: Right now this is fatal to really get the user's attention | 229 | // justincc: Right now this is fatal to really get the user's attention |
| 229 | throw e; | 230 | throw e; |