aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2011-07-23 11:39:32 +0100
committerMelanie2011-07-23 11:40:38 +0100
commit4cdc8806fbc0d0d9b0ff878b30a4491b347cf2dc (patch)
treeb377f9c359f09186a3cc40475cfbfde7c5b491f7 /OpenSim/Region
parentPass the first name and last name from the agent circuit data to the authoriz... (diff)
downloadopensim-SC_OLD-4cdc8806fbc0d0d9b0ff878b30a4491b347cf2dc.zip
opensim-SC_OLD-4cdc8806fbc0d0d9b0ff878b30a4491b347cf2dc.tar.gz
opensim-SC_OLD-4cdc8806fbc0d0d9b0ff878b30a4491b347cf2dc.tar.bz2
opensim-SC_OLD-4cdc8806fbc0d0d9b0ff878b30a4491b347cf2dc.tar.xz
Fix LLTextBox to work with the updated libOMV
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs4
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
5 files changed, 12 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a34ad62..60f0075 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -12083,7 +12083,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12083 OutPacket(packet, ThrottleOutPacketType.Task); 12083 OutPacket(packet, ThrottleOutPacketType.Task);
12084 } 12084 }
12085 12085
12086 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 12086 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
12087 { 12087 {
12088 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); 12088 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
12089 dialog.Data.ObjectID = objectId; 12089 dialog.Data.ObjectID = objectId;
@@ -12099,6 +12099,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
12099 buttons[0] = new ScriptDialogPacket.ButtonsBlock(); 12099 buttons[0] = new ScriptDialogPacket.ButtonsBlock();
12100 buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!"); 12100 buttons[0].ButtonLabel = Util.StringToBytes256("!!llTextBox!!");
12101 dialog.Buttons = buttons; 12101 dialog.Buttons = buttons;
12102
12103 dialog.OwnerData = new ScriptDialogPacket.OwnerDataBlock[1];
12104 dialog.OwnerData[0] = new ScriptDialogPacket.OwnerDataBlock();
12105 dialog.OwnerData[0].OwnerID = ownerID;
12106
12102 OutPacket(dialog, ThrottleOutPacketType.Task); 12107 OutPacket(dialog, ThrottleOutPacketType.Task);
12103 } 12108 }
12104 12109
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 0db31eb..36fe040 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -141,10 +141,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
141 { 141 {
142 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); 142 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
143 string ownerFirstName, ownerLastName; 143 string ownerFirstName, ownerLastName;
144 UUID ownerID = UUID.Zero;
144 if (account != null) 145 if (account != null)
145 { 146 {
146 ownerFirstName = account.FirstName; 147 ownerFirstName = account.FirstName;
147 ownerLastName = account.LastName; 148 ownerLastName = account.LastName;
149 ownerID = account.PrincipalID;
148 } 150 }
149 else 151 else
150 { 152 {
@@ -155,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
155 ScenePresence sp = m_scene.GetScenePresence(avatarid); 157 ScenePresence sp = m_scene.GetScenePresence(avatarid);
156 158
157 if (sp != null) 159 if (sp != null)
158 sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerFirstName, ownerLastName, objectid); 160 sp.ControllingClient.SendTextBoxRequest(message, chatChannel, name, ownerID, ownerFirstName, ownerLastName, objectid);
159 } 161 }
160 162
161 public void SendNotificationToUsersInRegion( 163 public void SendNotificationToUsersInRegion(
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 56b46d7..17766ea 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -1152,7 +1152,7 @@ namespace OpenSim.Region.Examples.SimpleModule
1152 { 1152 {
1153 } 1153 }
1154 1154
1155 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 1155 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
1156 { 1156 {
1157 } 1157 }
1158 1158
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 88db20e..3335f2e 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1678,7 +1678,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1678 { 1678 {
1679 } 1679 }
1680 1680
1681 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 1681 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
1682 { 1682 {
1683 } 1683 }
1684 1684
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index 15bc1b7..3afcc8d 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -1157,7 +1157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
1157 { 1157 {
1158 } 1158 }
1159 1159
1160 public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) 1160 public void SendTextBoxRequest(string message, int chatChannel, string objectname, UUID ownerID, string ownerFirstName, string ownerLastName, UUID objectId)
1161 { 1161 {
1162 } 1162 }
1163 1163