diff options
author | Homer Horwitz | 2009-05-16 16:01:25 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-05-16 16:01:25 +0000 |
commit | 99cf8e3f5ab73c6d25506678d78f847278865630 (patch) | |
tree | f8104a56f2579c385d2f390ad172cc904ca2608e /OpenSim/Region/ClientStack | |
parent | Oops. Next time try not to commit things at the same time as having important... (diff) | |
download | opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.zip opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.tar.gz opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.tar.bz2 opensim-SC_OLD-99cf8e3f5ab73c6d25506678d78f847278865630.tar.xz |
Send the owner name, not the client name on SendDialog.
This modifies IClientAPI.SendDialog slightly.
Fixes Mantis #3661.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 7c524d9..534136d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -2474,13 +2474,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2474 | OutPacket(loadURL, ThrottleOutPacketType.Task); | 2474 | OutPacket(loadURL, ThrottleOutPacketType.Task); |
2475 | } | 2475 | } |
2476 | 2476 | ||
2477 | public void SendDialog(string objectname, UUID objectID, UUID ownerID, string msg, UUID textureID, int ch, string[] buttonlabels) | 2477 | public void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) |
2478 | { | 2478 | { |
2479 | ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); | 2479 | ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); |
2480 | dialog.Data.ObjectID = objectID; | 2480 | dialog.Data.ObjectID = objectID; |
2481 | dialog.Data.ObjectName = Utils.StringToBytes(objectname); | 2481 | dialog.Data.ObjectName = Utils.StringToBytes(objectname); |
2482 | dialog.Data.FirstName = Utils.StringToBytes(FirstName); | 2482 | // this is the username of the *owner* |
2483 | dialog.Data.LastName = Utils.StringToBytes(LastName); | 2483 | dialog.Data.FirstName = Utils.StringToBytes(ownerFirstName); |
2484 | dialog.Data.LastName = Utils.StringToBytes(ownerLastName); | ||
2484 | dialog.Data.Message = Utils.StringToBytes(msg); | 2485 | dialog.Data.Message = Utils.StringToBytes(msg); |
2485 | dialog.Data.ImageID = textureID; | 2486 | dialog.Data.ImageID = textureID; |
2486 | dialog.Data.ChatChannel = ch; | 2487 | dialog.Data.ChatChannel = ch; |