From afd08c747736e18a9f8322c19103ceb703e10873 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Thu, 8 May 2008 14:09:12 +0000
Subject: * Proper fix for 1191 - Missing TypeData in
 ViewerEffectEventHandlerArg.

---
 OpenSim/Framework/ClientManager.cs                   | 3 +--
 OpenSim/Framework/IClientAPI.cs                      | 1 +
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 03a6008..5d9ccc0 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -184,8 +184,7 @@ namespace OpenSim.Framework
                 effect.Duration = args[i].Duration;
                 effect.ID = args[i].ID;
                 effect.Type = args[i].Type;
-                // This should be the target object I think - Adam
-                effect.TypeData = new byte[0];
+                effect.TypeData = args[i].TypeData;
                 effectBlock.Add(effect);
             }
             packet.Effect = effectBlock.ToArray();
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 60b49ab..277eb88 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -245,6 +245,7 @@ namespace OpenSim.Framework
         public float Duration;
         public LLUUID ID;
         public byte Type;
+        public byte[] TypeData;
     }
 
     public class LandUpdateArgs : EventArgs
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index aa27fdd..51c7184 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2930,6 +2930,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     argument.Duration = viewer.Effect[i].Duration;
                     argument.ID = viewer.Effect[i].ID;
                     argument.Type = viewer.Effect[i].Type;
+                    argument.TypeData = viewer.Effect[i].TypeData;
                     args.Add(argument);
                 }
 
-- 
cgit v1.1