diff options
| author | Melanie Thielker | 2008-11-16 18:53:17 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-16 18:53:17 +0000 |
| commit | ca8a2cad539e4868de16adb50bd7cae2de8d8af7 (patch) | |
| tree | f5430f1a977db943312a31d7ea78798d1eaa3769 /OpenSim | |
| parent | Make return object actually use the return object permissions (diff) | |
| download | opensim-SC-ca8a2cad539e4868de16adb50bd7cae2de8d8af7.zip opensim-SC-ca8a2cad539e4868de16adb50bd7cae2de8d8af7.tar.gz opensim-SC-ca8a2cad539e4868de16adb50bd7cae2de8d8af7.tar.bz2 opensim-SC-ca8a2cad539e4868de16adb50bd7cae2de8d8af7.tar.xz | |
Fix 2 bugs in the message transfer module, thanks, Homer Horwitz!
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs index d1543a0..7c90a64 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/MessageTransferModule.cs | |||
| @@ -56,14 +56,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
| 56 | if (config.Configs["Messaging"] != null) | 56 | if (config.Configs["Messaging"] != null) |
| 57 | { | 57 | { |
| 58 | IConfig cnf = config.Configs["Messaging"]; | 58 | IConfig cnf = config.Configs["Messaging"]; |
| 59 | if (cnf == null || cnf.GetString( | 59 | if (cnf != null && cnf.GetString( |
| 60 | "MessageTransferModule", "MessageTransferModule") != | 60 | "MessageTransferModule", "MessageTransferModule") != |
| 61 | "MessageTransferModule") | 61 | "MessageTransferModule") |
| 62 | return; | 62 | return; |
| 63 | 63 | ||
| 64 | cnf = config.Configs["Startup"]; | 64 | cnf = config.Configs["Startup"]; |
| 65 | if (cnf != null) | 65 | if (cnf != null) |
| 66 | m_Gridmode = cnf.GetBoolean("m_Gridmode", false); | 66 | m_Gridmode = cnf.GetBoolean("gridmode", false); |
| 67 | 67 | ||
| 68 | m_Enabled = true; | 68 | m_Enabled = true; |
| 69 | } | 69 | } |