diff options
author | Adam Frisby | 2008-05-07 20:31:48 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-07 20:31:48 +0000 |
commit | a95f13a646e6c0ff07c765437011a29c3372f1b9 (patch) | |
tree | 7129f9dae3624287f7f8320d0cf16e90e46f0298 /OpenSim/Framework/ClientManager.cs | |
parent | enable velocity on our full update, as I think I know why (diff) | |
download | opensim-SC-a95f13a646e6c0ff07c765437011a29c3372f1b9.zip opensim-SC-a95f13a646e6c0ff07c765437011a29c3372f1b9.tar.gz opensim-SC-a95f13a646e6c0ff07c765437011a29c3372f1b9.tar.bz2 opensim-SC-a95f13a646e6c0ff07c765437011a29c3372f1b9.tar.xz |
* Removes references to libsecondlife.Packets from IClientAPI. BAD PROGRAMMERS. NAUGHTY.
* Thanks to Andrew (DeepThink) for working on this one.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ClientManager.cs | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs index 35c9319..4f21ab6 100644 --- a/OpenSim/Framework/ClientManager.cs +++ b/OpenSim/Framework/ClientManager.cs | |||
@@ -171,11 +171,22 @@ namespace OpenSim.Framework | |||
171 | return circuits; | 171 | return circuits; |
172 | } | 172 | } |
173 | 173 | ||
174 | public void ViewerEffectHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock) | 174 | public void ViewerEffectHandler(IClientAPI sender, List<ViewerEffectEventHandlerArg> args) |
175 | { | 175 | { |
176 | ViewerEffectPacket packet = (ViewerEffectPacket) PacketPool.Instance.GetPacket(PacketType.ViewerEffect); | 176 | ViewerEffectPacket packet = (ViewerEffectPacket)PacketPool.Instance.GetPacket(PacketType.ViewerEffect); |
177 | // TODO: don't create new blocks if recycling an old packet | 177 | // TODO: don't create new blocks if recycling an old packet |
178 | packet.Effect = effectBlock; | 178 | List<ViewerEffectPacket.EffectBlock> effectBlock = new List<ViewerEffectPacket.EffectBlock>(); |
179 | for (int i = 0; i < args.Count; i++) | ||
180 | { | ||
181 | ViewerEffectPacket.EffectBlock effect = new ViewerEffectPacket.EffectBlock(); | ||
182 | effect.AgentID = args[i].AgentID; | ||
183 | effect.Color = args[i].Color; | ||
184 | effect.Duration = args[i].Duration; | ||
185 | effect.ID = args[i].ID; | ||
186 | effect.Type = args[i].Type; | ||
187 | effectBlock.Add(effect); | ||
188 | } | ||
189 | packet.Effect = effectBlock.ToArray(); | ||
179 | 190 | ||
180 | // Wasteful, I know | 191 | // Wasteful, I know |
181 | IClientAPI[] LocalClients = new IClientAPI[0]; | 192 | IClientAPI[] LocalClients = new IClientAPI[0]; |
@@ -205,4 +216,4 @@ namespace OpenSim.Framework | |||
205 | } | 216 | } |
206 | } | 217 | } |
207 | } | 218 | } |
208 | } \ No newline at end of file | 219 | } |