diff options
author | Adam Frisby | 2008-05-08 14:09:12 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-08 14:09:12 +0000 |
commit | afd08c747736e18a9f8322c19103ceb703e10873 (patch) | |
tree | d761bf8e46525e275b8b036196f7033280ff7b14 /OpenSim/Framework | |
parent | * Attempted Fix for 1191 - Crash on ViewerEffectHandler. We are missing typed... (diff) | |
download | opensim-SC-afd08c747736e18a9f8322c19103ceb703e10873.zip opensim-SC-afd08c747736e18a9f8322c19103ceb703e10873.tar.gz opensim-SC-afd08c747736e18a9f8322c19103ceb703e10873.tar.bz2 opensim-SC-afd08c747736e18a9f8322c19103ceb703e10873.tar.xz |
* Proper fix for 1191 - Missing TypeData in ViewerEffectEventHandlerArg.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ClientManager.cs | 3 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
2 files changed, 2 insertions, 2 deletions
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 | |||
184 | effect.Duration = args[i].Duration; | 184 | effect.Duration = args[i].Duration; |
185 | effect.ID = args[i].ID; | 185 | effect.ID = args[i].ID; |
186 | effect.Type = args[i].Type; | 186 | effect.Type = args[i].Type; |
187 | // This should be the target object I think - Adam | 187 | effect.TypeData = args[i].TypeData; |
188 | effect.TypeData = new byte[0]; | ||
189 | effectBlock.Add(effect); | 188 | effectBlock.Add(effect); |
190 | } | 189 | } |
191 | packet.Effect = effectBlock.ToArray(); | 190 | 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 | |||
245 | public float Duration; | 245 | public float Duration; |
246 | public LLUUID ID; | 246 | public LLUUID ID; |
247 | public byte Type; | 247 | public byte Type; |
248 | public byte[] TypeData; | ||
248 | } | 249 | } |
249 | 250 | ||
250 | public class LandUpdateArgs : EventArgs | 251 | public class LandUpdateArgs : EventArgs |