diff options
| author | Melanie | 2010-09-25 06:57:53 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-25 06:57:53 +0100 |
| commit | 0080f28f1db23884ee0502092e57a7063ce674aa (patch) | |
| tree | f0a87e2784c4ff3e5b48f00db8ccff60093bccb0 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Prevent spoofing the agent name on text IM (diff) | |
| download | opensim-SC-0080f28f1db23884ee0502092e57a7063ce674aa.zip opensim-SC-0080f28f1db23884ee0502092e57a7063ce674aa.tar.gz opensim-SC-0080f28f1db23884ee0502092e57a7063ce674aa.tar.bz2 opensim-SC-0080f28f1db23884ee0502092e57a7063ce674aa.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region')
| -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 fc1afaf..d2dc1ab 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs | |||
| @@ -183,6 +183,7 @@ 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 | m_TransferModule.SendInstantMessage(im, | 187 | m_TransferModule.SendInstantMessage(im, |
| 187 | delegate(bool success) | 188 | delegate(bool success) |
| 188 | { | 189 | { |
| @@ -223,4 +224,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 223 | OnInstantMessage(null, msg); | 224 | OnInstantMessage(null, msg); |
| 224 | } | 225 | } |
| 225 | } | 226 | } |
| 226 | } \ No newline at end of file | 227 | } |