diff options
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 34f2866..0e72e47 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -26,14 +26,10 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | ||
30 | using System.Collections; | 29 | using System.Collections; |
31 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
32 | 31 | using OpenMetaverse; | |
33 | using OSD = OpenMetaverse.StructuredData.OSD; | 32 | using OpenMetaverse.StructuredData; |
34 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | ||
35 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | ||
36 | using OSDParser = OpenMetaverse.StructuredData.OSDParser; | ||
37 | 33 | ||
38 | namespace OpenSim.Framework | 34 | namespace OpenSim.Framework |
39 | { | 35 | { |
@@ -486,7 +482,7 @@ namespace OpenSim.Framework | |||
486 | if (args["agent_access"] != null) | 482 | if (args["agent_access"] != null) |
487 | Byte.TryParse(args["agent_access"].AsString(), out AgentAccess); | 483 | Byte.TryParse(args["agent_access"].AsString(), out AgentAccess); |
488 | 484 | ||
489 | if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OpenMetaverse.StructuredData.OSDType.Array) | 485 | if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array) |
490 | { | 486 | { |
491 | OSDArray textures = (OSDArray)(args["agent_textures"]); | 487 | OSDArray textures = (OSDArray)(args["agent_textures"]); |
492 | AgentTextures = new UUID[textures.Count]; | 488 | AgentTextures = new UUID[textures.Count]; |
@@ -498,28 +494,28 @@ namespace OpenSim.Framework | |||
498 | if (args["active_group_id"] != null) | 494 | if (args["active_group_id"] != null) |
499 | ActiveGroupID = args["active_group_id"].AsUUID(); | 495 | ActiveGroupID = args["active_group_id"].AsUUID(); |
500 | 496 | ||
501 | if ((args["groups"] != null) && (args["groups"]).Type == OpenMetaverse.StructuredData.OSDType.Array) | 497 | if ((args["groups"] != null) && (args["groups"]).Type == OSDType.Array) |
502 | { | 498 | { |
503 | OSDArray groups = (OSDArray)(args["groups"]); | 499 | OSDArray groups = (OSDArray)(args["groups"]); |
504 | Groups = new AgentGroupData[groups.Count]; | 500 | Groups = new AgentGroupData[groups.Count]; |
505 | int i = 0; | 501 | int i = 0; |
506 | foreach (OSD o in groups) | 502 | foreach (OSD o in groups) |
507 | { | 503 | { |
508 | if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) | 504 | if (o.Type == OSDType.Map) |
509 | { | 505 | { |
510 | Groups[i++] = new AgentGroupData((OSDMap)o); | 506 | Groups[i++] = new AgentGroupData((OSDMap)o); |
511 | } | 507 | } |
512 | } | 508 | } |
513 | } | 509 | } |
514 | 510 | ||
515 | if ((args["animations"] != null) && (args["animations"]).Type == OpenMetaverse.StructuredData.OSDType.Array) | 511 | if ((args["animations"] != null) && (args["animations"]).Type == OSDType.Array) |
516 | { | 512 | { |
517 | OSDArray anims = (OSDArray)(args["animations"]); | 513 | OSDArray anims = (OSDArray)(args["animations"]); |
518 | Anims = new AgentAnimationData[anims.Count]; | 514 | Anims = new AgentAnimationData[anims.Count]; |
519 | int i = 0; | 515 | int i = 0; |
520 | foreach (OSD o in anims) | 516 | foreach (OSD o in anims) |
521 | { | 517 | { |
522 | if (o.Type == OpenMetaverse.StructuredData.OSDType.Map) | 518 | if (o.Type == OSDType.Map) |
523 | { | 519 | { |
524 | Anims[i++] = new AgentAnimationData((OSDMap)o); | 520 | Anims[i++] = new AgentAnimationData((OSDMap)o); |
525 | } | 521 | } |