aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-31 19:25:01 +0100
committerJustin Clark-Casey (justincc)2011-05-31 19:25:01 +0100
commit8129e64e2acea6509d5c3a80425f6aa68baa037c (patch)
tree99f20a6caa70274060e43894f0e1143c20b66822 /OpenSim/Region/ClientStack
parentrevert the patch that accidentally got added in the last commit (diff)
downloadopensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.zip
opensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.tar.gz
opensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.tar.bz2
opensim-SC_OLD-8129e64e2acea6509d5c3a80425f6aa68baa037c.tar.xz
Fill in the new OwnerData field in the LLUDP ScriptDialog message.
If we don't do this then viewer 2.8 crashes. Resolves http://opensimulator.org/mantis/view.php?id=5510
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs11
1 files changed, 8 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 5a2c45c..821a370 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -2213,7 +2213,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2213 OutPacket(loadURL, ThrottleOutPacketType.Task); 2213 OutPacket(loadURL, ThrottleOutPacketType.Task);
2214 } 2214 }
2215 2215
2216 public void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) 2216 public void SendDialog(
2217 string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg,
2218 UUID textureID, int ch, string[] buttonlabels)
2217 { 2219 {
2218 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); 2220 ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog);
2219 dialog.Data.ObjectID = objectID; 2221 dialog.Data.ObjectID = objectID;
@@ -2231,6 +2233,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2231 buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]); 2233 buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]);
2232 } 2234 }
2233 dialog.Buttons = buttons; 2235 dialog.Buttons = buttons;
2236
2237 dialog.OwnerData = new ScriptDialogPacket.OwnerDataBlock[1];
2238 dialog.OwnerData[0] = new ScriptDialogPacket.OwnerDataBlock();
2239 dialog.OwnerData[0].OwnerID = ownerID;
2240
2234 OutPacket(dialog, ThrottleOutPacketType.Task); 2241 OutPacket(dialog, ThrottleOutPacketType.Task);
2235 } 2242 }
2236 2243
@@ -2293,8 +2300,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2293 OrbitalPosition = (OrbitalPosition - m_sunPainDaHalfOrbitalCutoff) * 0.6666666667f + m_sunPainDaHalfOrbitalCutoff; 2300 OrbitalPosition = (OrbitalPosition - m_sunPainDaHalfOrbitalCutoff) * 0.6666666667f + m_sunPainDaHalfOrbitalCutoff;
2294 } 2301 }
2295 2302
2296
2297
2298 SimulatorViewerTimeMessagePacket viewertime = (SimulatorViewerTimeMessagePacket)PacketPool.Instance.GetPacket(PacketType.SimulatorViewerTimeMessage); 2303 SimulatorViewerTimeMessagePacket viewertime = (SimulatorViewerTimeMessagePacket)PacketPool.Instance.GetPacket(PacketType.SimulatorViewerTimeMessage);
2299 viewertime.TimeInfo.SunDirection = Position; 2304 viewertime.TimeInfo.SunDirection = Position;
2300 viewertime.TimeInfo.SunAngVelocity = Velocity; 2305 viewertime.TimeInfo.SunAngVelocity = Velocity;