diff options
| author | Melanie | 2009-11-15 20:21:46 +0000 |
|---|---|---|
| committer | Melanie | 2009-11-15 20:21:46 +0000 |
| commit | b7f1fc116eb37a651a80bc09df11fa47540a1df9 (patch) | |
| tree | 11211391d6786d186034d8cbed916de62ae20de3 /OpenSim | |
| parent | - Lower TIME_MS_TOLERANCE to 200ms - Allow m_updateFlag to be reset to 0 in t... (diff) | |
| download | opensim-SC-b7f1fc116eb37a651a80bc09df11fa47540a1df9.zip opensim-SC-b7f1fc116eb37a651a80bc09df11fa47540a1df9.tar.gz opensim-SC-b7f1fc116eb37a651a80bc09df11fa47540a1df9.tar.bz2 opensim-SC-b7f1fc116eb37a651a80bc09df11fa47540a1df9.tar.xz | |
Prevent a nullref if a recipient of a group message gas left the scene
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index 1614b70..7f9e5af 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
| @@ -164,19 +164,22 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 164 | List<GridInstantMessage>msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( | 164 | List<GridInstantMessage>msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( |
| 165 | "POST", m_RestURL+"/RetrieveMessages/", client.AgentId); | 165 | "POST", m_RestURL+"/RetrieveMessages/", client.AgentId); |
| 166 | 166 | ||
| 167 | foreach (GridInstantMessage im in msglist) | 167 | if (msglist != null) |
| 168 | { | 168 | { |
| 169 | // client.SendInstantMessage(im); | 169 | foreach (GridInstantMessage im in msglist) |
| 170 | 170 | { | |
| 171 | // Send through scene event manager so all modules get a chance | 171 | // client.SendInstantMessage(im); |
| 172 | // to look at this message before it gets delivered. | 172 | |
| 173 | // | 173 | // Send through scene event manager so all modules get a chance |
| 174 | // Needed for proper state management for stored group | 174 | // to look at this message before it gets delivered. |
| 175 | // invitations | 175 | // |
| 176 | // | 176 | // Needed for proper state management for stored group |
| 177 | Scene s = FindScene(client.AgentId); | 177 | // invitations |
| 178 | if (s != null) | 178 | // |
| 179 | s.EventManager.TriggerIncomingInstantMessage(im); | 179 | Scene s = FindScene(client.AgentId); |
| 180 | if (s != null) | ||
| 181 | s.EventManager.TriggerIncomingInstantMessage(im); | ||
| 182 | } | ||
| 180 | } | 183 | } |
| 181 | } | 184 | } |
| 182 | 185 | ||