aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorMelanie2011-07-23 18:34:46 +0200
committerMelanie2011-07-23 18:34:46 +0200
commit2e83b48873ae93776c257d6b829a14473a0a3a0d (patch)
treec0cfc4fe60fc840ba992cf9b59c9fe8239f72a48 /OpenSim/Region/ClientStack/Linden/UDP
parentFix failure to find avatars due to trainling spaces being sent by viewers. (diff)
parentFix LLTextBox to work with the updated libOMV (diff)
downloadopensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.zip
opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.gz
opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.bz2
opensim-SC-2e83b48873ae93776c257d6b829a14473a0a3a0d.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 99552f1..d5419cc 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12129,7 +12129,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12129 OutPacket(packet, ThrottleOutPacketType.Task); 12129 OutPacket(packet, ThrottleOutPacketType.Task);
12130 } 12130 }
12131 12131
12132 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 12132 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
12133 { 12133 {
12134 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); 12134 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
12135 dialog.Data.ObjectID = objectId; 12135 dialog.Data.ObjectID = objectId;
@@ -12145,6 +12145,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12145 buttons[0] = new ScriptDialogPacket.ButtonsBlock(); 12145 buttons[0] = new ScriptDialogPacket.ButtonsBlock();
12146 buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!"); 12146 buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!");
12147 dialog.Buttons = buttons; 12147 dialog.Buttons = buttons;
12148
12149 dialog.OwnerData = new ScriptDialogPacket.OwnerDataBlock[1];
12150 dialog.OwnerData[0] = new ScriptDialogPacket.OwnerDataBlock();
12151 dialog.OwnerData[0].OwnerID = ownerID;
12152
12148 OutPacket(dialog, ThrottleOutPacketType.Task); 12153 OutPacket(dialog, ThrottleOutPacketType.Task);
12149 } 12154 }
12150 12155