diff options
| author | Melanie | 2011-10-25 03:19:49 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 03:19:49 +0100 |
| commit | 271c798813721b38b3e7ae531cce2801ee51c186 (patch) | |
| tree | b42eb249bdca3d0aa714f3544ed0752015c8c745 /OpenSim/Region/CoreModules | |
| parent | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge (diff) | |
| parent | Fix missing Busy-Mode Response (diff) | |
| download | opensim-SC-271c798813721b38b3e7ae531cce2801ee51c186.zip opensim-SC-271c798813721b38b3e7ae531cce2801ee51c186.tar.gz opensim-SC-271c798813721b38b3e7ae531cce2801ee51c186.tar.bz2 opensim-SC-271c798813721b38b3e7ae531cce2801ee51c186.tar.xz | |
Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index feb5fb8..1af4d68 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -151,6 +151,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 151 | if (dialog != (byte)InstantMessageDialog.MessageFromAgent | 151 | if (dialog != (byte)InstantMessageDialog.MessageFromAgent |
| 152 | && dialog != (byte)InstantMessageDialog.StartTyping | 152 | && dialog != (byte)InstantMessageDialog.StartTyping |
| 153 | && dialog != (byte)InstantMessageDialog.StopTyping | 153 | && dialog != (byte)InstantMessageDialog.StopTyping |
| 154 | && dialog != (byte)InstantMessageDialog.BusyAutoResponse | ||
| 154 | && dialog != (byte)InstantMessageDialog.MessageFromObject) | 155 | && dialog != (byte)InstantMessageDialog.MessageFromObject) |
| 155 | { | 156 | { |
| 156 | return; | 157 | return; |