diff options
| author | Melanie | 2010-09-26 23:50:55 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-26 23:50:55 +0100 |
| commit | 6f78358b09e5a14c4af802a12cfb805b8fc8cdb4 (patch) | |
| tree | 4fade6673bc2dd4db77fb0ba173807c6005938af /OpenSim/Region/CoreModules | |
| parent | Consistency patch: use Path.Combine() instead of + and eliminate the need (diff) | |
| download | opensim-SC-6f78358b09e5a14c4af802a12cfb805b8fc8cdb4.zip opensim-SC-6f78358b09e5a14c4af802a12cfb805b8fc8cdb4.tar.gz opensim-SC-6f78358b09e5a14c4af802a12cfb805b8fc8cdb4.tar.bz2 opensim-SC-6f78358b09e5a14c4af802a12cfb805b8fc8cdb4.tar.xz | |
When receiving intersim IM, don't let the spoof protection bomb
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 bafb802..af39565 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -158,7 +158,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 158 | 158 | ||
| 159 | if (m_TransferModule != null) | 159 | if (m_TransferModule != null) |
| 160 | { | 160 | { |
| 161 | im.fromAgentName = client.FirstName + " " + client.LastName; | 161 | if (client != null) |
| 162 | im.fromAgentName = client.FirstName + " " + client.LastName; | ||
| 162 | m_TransferModule.SendInstantMessage(im, | 163 | m_TransferModule.SendInstantMessage(im, |
| 163 | delegate(bool success) | 164 | delegate(bool success) |
| 164 | { | 165 | { |