diff options
| author | Melanie Thielker | 2010-08-04 02:51:41 +0200 |
|---|---|---|
| committer | Melanie | 2010-08-04 02:46:30 +0100 |
| commit | bda83715e405202e73a2df9eb10daa8f892490c8 (patch) | |
| tree | 9692a828c84793d068a3c9c8df6b886cd0ac8383 /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-bda83715e405202e73a2df9eb10daa8f892490c8.zip opensim-SC-bda83715e405202e73a2df9eb10daa8f892490c8.tar.gz opensim-SC-bda83715e405202e73a2df9eb10daa8f892490c8.tar.bz2 opensim-SC-bda83715e405202e73a2df9eb10daa8f892490c8.tar.xz | |
Clean up some messiness in IM sending. Having offline IM enabled now no longer
suppresses "Inventory Saved" messages.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index ab141eb..a3c40e0 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -162,7 +162,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 162 | delegate(bool success) | 162 | delegate(bool success) |
| 163 | { | 163 | { |
| 164 | if (dialog == (uint)InstantMessageDialog.StartTyping || | 164 | if (dialog == (uint)InstantMessageDialog.StartTyping || |
| 165 | dialog == (uint)InstantMessageDialog.StopTyping) | 165 | dialog == (uint)InstantMessageDialog.StopTyping || |
| 166 | dialog == (uint)InstantMessageDialog.MessageFromObject) | ||
| 166 | { | 167 | { |
| 167 | return; | 168 | return; |
| 168 | } | 169 | } |