diff options
| author | Melanie | 2010-09-26 23:57:06 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-26 23:57:06 +0100 |
| commit | 9f17ae580dd2c6000c1f90ad83bb00e1ba097666 (patch) | |
| tree | fa2fed00e1f2d54150822019caa03ee6dab7e73f /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
| parent | Typo fixes (diff) | |
| parent | When receiving intersim IM, don't let the spoof protection bomb (diff) | |
| download | opensim-SC_OLD-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.zip opensim-SC_OLD-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.tar.gz opensim-SC_OLD-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.tar.bz2 opensim-SC_OLD-9f17ae580dd2c6000c1f90ad83bb00e1ba097666.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index d2dc1ab..347708d 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -183,7 +183,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 183 | 183 | ||
| 184 | if (m_TransferModule != null) | 184 | if (m_TransferModule != null) |
| 185 | { | 185 | { |
| 186 | im.fromAgentName = client.FirstName + " " + client.LastName; | 186 | if (client != null) |
| 187 | im.fromAgentName = client.FirstName + " " + client.LastName; | ||
| 187 | m_TransferModule.SendInstantMessage(im, | 188 | m_TransferModule.SendInstantMessage(im, |
| 188 | delegate(bool success) | 189 | delegate(bool success) |
| 189 | { | 190 | { |