diff options
author | Melanie | 2011-11-14 20:03:47 +0000 |
---|---|---|
committer | Melanie | 2011-11-14 20:03:47 +0000 |
commit | afca742392e30748de13a125f932046949af0bcb (patch) | |
tree | 34e9dd92533abe446e356d9fb1ad8625cb28c9bc /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | minor: remove some mono compiler warnings (diff) | |
download | opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.zip opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.gz opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.bz2 opensim-SC_OLD-afca742392e30748de13a125f932046949af0bcb.tar.xz |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs index 321a705..560d913 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs | |||
@@ -225,12 +225,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
225 | foreach (Scene scene in m_Scenes) | 225 | foreach (Scene scene in m_Scenes) |
226 | { | 226 | { |
227 | ScenePresence sp = scene.GetScenePresence(toAgentID); | 227 | ScenePresence sp = scene.GetScenePresence(toAgentID); |
228 | if(!sp.IsChildAgent) | 228 | if(sp != null && !sp.IsChildAgent) |
229 | { | 229 | { |
230 | scene.EventManager.TriggerIncomingInstantMessage(gim); | 230 | scene.EventManager.TriggerIncomingInstantMessage(gim); |
231 | successful = true; | 231 | successful = true; |
232 | } | 232 | } |
233 | } | 233 | } |
234 | |||
234 | if (!successful) | 235 | if (!successful) |
235 | { | 236 | { |
236 | // If the message can't be delivered to an agent, it | 237 | // If the message can't be delivered to an agent, it |