diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 5a2c45c..d8fcb62 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -1469,6 +1469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1469 | money.MoneyData.TransactionSuccess = success; | 1469 | money.MoneyData.TransactionSuccess = success; |
1470 | money.MoneyData.Description = description; | 1470 | money.MoneyData.Description = description; |
1471 | money.MoneyData.MoneyBalance = balance; | 1471 | money.MoneyData.MoneyBalance = balance; |
1472 | money.TransactionInfo.ItemDescription = Util.StringToBytes256("NONE"); | ||
1472 | OutPacket(money, ThrottleOutPacketType.Task); | 1473 | OutPacket(money, ThrottleOutPacketType.Task); |
1473 | } | 1474 | } |
1474 | 1475 | ||
@@ -2213,7 +2214,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2213 | OutPacket(loadURL, ThrottleOutPacketType.Task); | 2214 | OutPacket(loadURL, ThrottleOutPacketType.Task); |
2214 | } | 2215 | } |
2215 | 2216 | ||
2216 | public void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) | 2217 | public void SendDialog( |
2218 | string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, | ||
2219 | UUID textureID, int ch, string[] buttonlabels) | ||
2217 | { | 2220 | { |
2218 | ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); | 2221 | ScriptDialogPacket dialog = (ScriptDialogPacket)PacketPool.Instance.GetPacket(PacketType.ScriptDialog); |
2219 | dialog.Data.ObjectID = objectID; | 2222 | dialog.Data.ObjectID = objectID; |
@@ -2231,6 +2234,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2231 | buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]); | 2234 | buttons[i].ButtonLabel = Util.StringToBytes256(buttonlabels[i]); |
2232 | } | 2235 | } |
2233 | dialog.Buttons = buttons; | 2236 | dialog.Buttons = buttons; |
2237 | |||
2238 | dialog.OwnerData = new ScriptDialogPacket.OwnerDataBlock[1]; | ||
2239 | dialog.OwnerData[0] = new ScriptDialogPacket.OwnerDataBlock(); | ||
2240 | dialog.OwnerData[0].OwnerID = ownerID; | ||
2241 | |||
2234 | OutPacket(dialog, ThrottleOutPacketType.Task); | 2242 | OutPacket(dialog, ThrottleOutPacketType.Task); |
2235 | } | 2243 | } |
2236 | 2244 | ||
@@ -2293,8 +2301,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
2293 | OrbitalPosition = (OrbitalPosition - m_sunPainDaHalfOrbitalCutoff) * 0.6666666667f + m_sunPainDaHalfOrbitalCutoff; | 2301 | OrbitalPosition = (OrbitalPosition - m_sunPainDaHalfOrbitalCutoff) * 0.6666666667f + m_sunPainDaHalfOrbitalCutoff; |
2294 | } | 2302 | } |
2295 | 2303 | ||
2296 | |||
2297 | |||
2298 | SimulatorViewerTimeMessagePacket viewertime = (SimulatorViewerTimeMessagePacket)PacketPool.Instance.GetPacket(PacketType.SimulatorViewerTimeMessage); | 2304 | SimulatorViewerTimeMessagePacket viewertime = (SimulatorViewerTimeMessagePacket)PacketPool.Instance.GetPacket(PacketType.SimulatorViewerTimeMessage); |
2299 | viewertime.TimeInfo.SunDirection = Position; | 2305 | viewertime.TimeInfo.SunDirection = Position; |
2300 | viewertime.TimeInfo.SunAngVelocity = Velocity; | 2306 | viewertime.TimeInfo.SunAngVelocity = Velocity; |