diff options
author | Melanie Thielker | 2008-10-26 19:32:41 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-26 19:32:41 +0000 |
commit | f7e44250bf6058a7f232b5555d709787f1a2eb6b (patch) | |
tree | f9197d06761c96d1b47f0b4dd56cef8aca6bf4b5 /OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | |
parent | Thank you kindly, Idb for a patch that solves: (diff) | |
download | opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.zip opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.tar.gz opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.tar.bz2 opensim-SC_OLD-f7e44250bf6058a7f232b5555d709787f1a2eb6b.tar.xz |
Committing a small fix for EventData along with more plumbing work
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index 3e45f7f..2553266 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -118,13 +118,17 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
118 | || dialog == (byte) InstantMessageDialog.InventoryOffered | 118 | || dialog == (byte) InstantMessageDialog.InventoryOffered |
119 | || dialog == (byte) InstantMessageDialog.InventoryAccepted | 119 | || dialog == (byte) InstantMessageDialog.InventoryAccepted |
120 | || dialog == (byte) InstantMessageDialog.InventoryDeclined | 120 | || dialog == (byte) InstantMessageDialog.InventoryDeclined |
121 | || dialog == (byte) InstantMessageDialog.GroupNoticeInventoryAccepted | ||
122 | || dialog == (byte) InstantMessageDialog.GroupNoticeInventoryDeclined | ||
123 | || dialog == (byte) InstantMessageDialog.GroupInvitationAccept | ||
124 | || dialog == (byte) InstantMessageDialog.GroupInvitationDecline | ||
121 | || dialog == (byte) InstantMessageDialog.GroupNotice); | 125 | || dialog == (byte) InstantMessageDialog.GroupNotice); |
122 | 126 | ||
123 | // IM dialogs need to be pre-processed and have their sessionID filled by the server | 127 | // IM dialogs need to be pre-processed and have their sessionID filled by the server |
124 | // so the sim can match the transaction on the return packet. | 128 | // so the sim can match the transaction on the return packet. |
125 | 129 | ||
126 | // Don't send a Friend Dialog IM with a UUID.Zero session. | 130 | // Don't send a Friend Dialog IM with a UUID.Zero session. |
127 | if (!(dialogHandledElsewhere && imSessionID == UUID.Zero)) | 131 | if (!dialogHandledElsewhere) |
128 | { | 132 | { |
129 | // Try root avatar only first | 133 | // Try root avatar only first |
130 | foreach (Scene scene in m_scenes) | 134 | foreach (Scene scene in m_scenes) |
@@ -137,7 +141,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
137 | { | 141 | { |
138 | user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, | 142 | user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, |
139 | toAgentID, imSessionID, fromAgentName, dialog, | 143 | toAgentID, imSessionID, fromAgentName, dialog, |
140 | timestamp); | 144 | timestamp, fromGroup, binaryBucket); |
141 | // Message sent | 145 | // Message sent |
142 | return; | 146 | return; |
143 | } | 147 | } |
@@ -154,7 +158,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
154 | 158 | ||
155 | user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, | 159 | user.ControllingClient.SendInstantMessage(fromAgentID, fromAgentSession, message, |
156 | toAgentID, imSessionID, fromAgentName, dialog, | 160 | toAgentID, imSessionID, fromAgentName, dialog, |
157 | timestamp); | 161 | timestamp, fromGroup, binaryBucket); |
158 | // Message sent | 162 | // Message sent |
159 | return; | 163 | return; |
160 | } | 164 | } |