diff options
| author | Homer Horwitz | 2008-11-16 19:45:46 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-11-16 19:45:46 +0000 |
| commit | e1ccbed982cd4500a8b04a5399ac0053d3c2cb47 (patch) | |
| tree | da2c6c05f77a885938127e0dad3902af27ab77d2 /OpenSim/Region/Environment/Modules | |
| parent | Add MessageTransferModule interface to all scenes, not only the first (diff) | |
| download | opensim-SC-e1ccbed982cd4500a8b04a5399ac0053d3c2cb47.zip opensim-SC-e1ccbed982cd4500a8b04a5399ac0053d3c2cb47.tar.gz opensim-SC-e1ccbed982cd4500a8b04a5399ac0053d3c2cb47.tar.bz2 opensim-SC-e1ccbed982cd4500a8b04a5399ac0053d3c2cb47.tar.xz | |
GridIMs don't have a (sending) client, which led to a NRE on access.
Doesn't use client now in that case.
Diffstat (limited to 'OpenSim/Region/Environment/Modules')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs index 1b7eb97..339f1f9 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -127,7 +127,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.InstantMessage | |||
| 127 | return; | 127 | return; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | GridInstantMessage im = new GridInstantMessage(client.Scene, | 130 | IScene scene = client == null ? null : client.Scene; |
| 131 | GridInstantMessage im = new GridInstantMessage(scene, | ||
| 131 | fromAgentID, fromAgentName, fromAgentSession, toAgentID, | 132 | fromAgentID, fromAgentName, fromAgentSession, toAgentID, |
| 132 | dialog, fromGroup, message, imSessionID, | 133 | dialog, fromGroup, message, imSessionID, |
| 133 | offline != 0 ? true : false, Position, | 134 | offline != 0 ? true : false, Position, |