diff options
author | Justin Clark-Casey (justincc) | 2010-10-30 03:07:45 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-10-30 03:07:45 +0100 |
commit | f9227977f8190ff1cf094e4adb025a822645371f (patch) | |
tree | 5afbce81eb5359f8beaeaef3f7c30518e689f4f6 /OpenSim/Framework/AgentCircuitData.cs | |
parent | minor: remove some old commented out code (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-f9227977f8190ff1cf094e4adb025a822645371f.zip opensim-SC-f9227977f8190ff1cf094e4adb025a822645371f.tar.gz opensim-SC-f9227977f8190ff1cf094e4adb025a822645371f.tar.bz2 opensim-SC-f9227977f8190ff1cf094e4adb025a822645371f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/AgentCircuitData.cs')
-rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 640a646..cd30c3d 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
@@ -218,35 +218,6 @@ namespace OpenSim.Framework | |||
218 | { | 218 | { |
219 | args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); | 219 | args["appearance_serial"] = OSD.FromInteger(Appearance.Serial); |
220 | 220 | ||
221 | //System.Console.WriteLine("XXX Before packing Wearables"); | ||
222 | if ((Appearance.Wearables != null) && (Appearance.Wearables.Length > 0)) | ||
223 | { | ||
224 | OSDArray wears = new OSDArray(Appearance.Wearables.Length * 2); | ||
225 | foreach (AvatarWearable awear in Appearance.Wearables) | ||
226 | { | ||
227 | wears.Add(OSD.FromUUID(awear.ItemID)); | ||
228 | wears.Add(OSD.FromUUID(awear.AssetID)); | ||
229 | //System.Console.WriteLine("XXX ItemID=" + awear.ItemID + " assetID=" + awear.AssetID); | ||
230 | } | ||
231 | args["wearables"] = wears; | ||
232 | } | ||
233 | |||
234 | //System.Console.WriteLine("XXX Before packing Attachments"); | ||
235 | List<AvatarAttachment> attachments = Appearance.GetAttachments(); | ||
236 | if ((attachments != null) && (attachments.Count > 0)) | ||
237 | { | ||
238 | OSDArray attachs = new OSDArray(attachments.Count); | ||
239 | foreach (AvatarAttachment attach in attachments) | ||
240 | { | ||
241 | attachs.Add(attach.Pack()); | ||
242 | //System.Console.WriteLine("XXX att.pt=" + kvp.Key + "; itemID=" + kvp.Value[0] + "; assetID=" + kvp.Value[1]); | ||
243 | } | ||
244 | args["attachments"] = attachs; | ||
245 | } | ||
246 | } | ||
247 | |||
248 | if (Appearance != null) | ||
249 | { | ||
250 | OSDMap appmap = Appearance.Pack(); | 221 | OSDMap appmap = Appearance.Pack(); |
251 | args["packed_appearance"] = appmap; | 222 | args["packed_appearance"] = appmap; |
252 | } | 223 | } |
@@ -346,28 +317,6 @@ namespace OpenSim.Framework | |||
346 | if (args["appearance_serial"] != null) | 317 | if (args["appearance_serial"] != null) |
347 | Appearance.Serial = args["appearance_serial"].AsInteger(); | 318 | Appearance.Serial = args["appearance_serial"].AsInteger(); |
348 | 319 | ||
349 | if ((args["wearables"] != null) && (args["wearables"]).Type == OSDType.Array) | ||
350 | { | ||
351 | OSDArray wears = (OSDArray)(args["wearables"]); | ||
352 | for (int i = 0; i < wears.Count / 2; i++) | ||
353 | { | ||
354 | AvatarWearable awear = new AvatarWearable(wears[i*2].AsUUID(),wears[(i*2)+1].AsUUID()); | ||
355 | Appearance.SetWearable(i,awear); | ||
356 | } | ||
357 | } | ||
358 | |||
359 | if ((args["attachments"] != null) && (args["attachments"]).Type == OSDType.Array) | ||
360 | { | ||
361 | OSDArray attachs = (OSDArray)(args["attachments"]); | ||
362 | foreach (OSD o in attachs) | ||
363 | { | ||
364 | if (o.Type == OSDType.Map) | ||
365 | { | ||
366 | Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o)); | ||
367 | } | ||
368 | } | ||
369 | } | ||
370 | |||
371 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map)) | 320 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"].Type == OSDType.Map)) |
372 | { | 321 | { |
373 | Appearance.Unpack((OSDMap)args["packed_appearance"]); | 322 | Appearance.Unpack((OSDMap)args["packed_appearance"]); |