aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2008-05-08 14:09:12 +0000
committerAdam Frisby2008-05-08 14:09:12 +0000
commitafd08c747736e18a9f8322c19103ceb703e10873 (patch)
treed761bf8e46525e275b8b036196f7033280ff7b14
parent* Attempted Fix for 1191 - Crash on ViewerEffectHandler. We are missing typed... (diff)
downloadopensim-SC_OLD-afd08c747736e18a9f8322c19103ceb703e10873.zip
opensim-SC_OLD-afd08c747736e18a9f8322c19103ceb703e10873.tar.gz
opensim-SC_OLD-afd08c747736e18a9f8322c19103ceb703e10873.tar.bz2
opensim-SC_OLD-afd08c747736e18a9f8322c19103ceb703e10873.tar.xz
* Proper fix for 1191 - Missing TypeData in ViewerEffectEventHandlerArg.
-rw-r--r--OpenSim/Framework/ClientManager.cs3
-rw-r--r--OpenSim/Framework/IClientAPI.cs1
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs1
3 files changed, 3 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
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
2930 argument.Duration = viewer.Effect[i].Duration; 2930 argument.Duration = viewer.Effect[i].Duration;
2931 argument.ID = viewer.Effect[i].ID; 2931 argument.ID = viewer.Effect[i].ID;
2932 argument.Type = viewer.Effect[i].Type; 2932 argument.Type = viewer.Effect[i].Type;
2933 argument.TypeData = viewer.Effect[i].TypeData;
2933 args.Add(argument); 2934 args.Add(argument);
2934 } 2935 }
2935 2936