diff options
| author | Melanie Thielker | 2010-08-19 12:02:26 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2010-08-19 12:02:26 +0200 |
| commit | fdc59ee802c5095b2b6f5bd50283a4079702cb93 (patch) | |
| tree | c44d3550345294a2753f6349d7a1d178a2023d32 /OpenSim | |
| parent | Skip conversion if fields that are null in the database. This may (diff) | |
| parent | Adding Group managment to the offline system (diff) | |
| download | opensim-SC_OLD-fdc59ee802c5095b2b6f5bd50283a4079702cb93.zip opensim-SC_OLD-fdc59ee802c5095b2b6f5bd50283a4079702cb93.tar.gz opensim-SC_OLD-fdc59ee802c5095b2b6f5bd50283a4079702cb93.tar.bz2 opensim-SC_OLD-fdc59ee802c5095b2b6f5bd50283a4079702cb93.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index feeb9e6..d3db5b7 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
| @@ -215,6 +215,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 215 | if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && | 215 | if (im.dialog != (byte)InstantMessageDialog.MessageFromObject && |
| 216 | im.dialog != (byte)InstantMessageDialog.MessageFromAgent && | 216 | im.dialog != (byte)InstantMessageDialog.MessageFromAgent && |
| 217 | im.dialog != (byte)InstantMessageDialog.GroupNotice && | 217 | im.dialog != (byte)InstantMessageDialog.GroupNotice && |
| 218 | im.dialog != (byte)InstantMessageDialog.GroupInvitation && | ||
| 218 | im.dialog != (byte)InstantMessageDialog.InventoryOffered) | 219 | im.dialog != (byte)InstantMessageDialog.InventoryOffered) |
| 219 | { | 220 | { |
| 220 | return; | 221 | return; |