diff options
author | Melanie Thielker | 2016-06-21 00:21:08 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-06-21 01:20:21 +0200 |
commit | 9de8cefee55a23149b09d55339736bb324856ad9 (patch) | |
tree | 214006cd5441e362a13ba9416cbb2cd3fe3326b8 /OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |
parent | Guard against multiple calls to SetOwnerId on one logical ownership change. (diff) | |
download | opensim-SC_OLD-9de8cefee55a23149b09d55339736bb324856ad9.zip opensim-SC_OLD-9de8cefee55a23149b09d55339736bb324856ad9.tar.gz opensim-SC_OLD-9de8cefee55a23149b09d55339736bb324856ad9.tar.bz2 opensim-SC_OLD-9de8cefee55a23149b09d55339736bb324856ad9.tar.xz |
Split IM handling so an inheriting module can cange names if required.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index fb868be..2ba35df 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
@@ -154,6 +154,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
154 | 154 | ||
155 | #endregion | 155 | #endregion |
156 | 156 | ||
157 | public virtual void OnViewerInstantMessage(IClientAPI client, GridInstantMessage im) | ||
158 | { | ||
159 | im.fromAgentName = client.FirstName + " " + client.LastName; | ||
160 | OnInstantMessage(client, im); | ||
161 | } | ||
162 | |||
157 | public virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 163 | public virtual void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
158 | { | 164 | { |
159 | byte dialog = im.dialog; | 165 | byte dialog = im.dialog; |
@@ -198,8 +204,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
198 | 204 | ||
199 | if (m_TransferModule != null) | 205 | if (m_TransferModule != null) |
200 | { | 206 | { |
201 | if (client != null) | ||
202 | im.fromAgentName = client.FirstName + " " + client.LastName; | ||
203 | m_TransferModule.SendInstantMessage(im, | 207 | m_TransferModule.SendInstantMessage(im, |
204 | delegate(bool success) | 208 | delegate(bool success) |
205 | { | 209 | { |