diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 710a57d..5a4811e 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -441,7 +441,6 @@ namespace OpenSim.Framework | |||
441 | args["controllers"] = controls; | 441 | args["controllers"] = controls; |
442 | } | 442 | } |
443 | 443 | ||
444 | |||
445 | if ((CallbackURI != null) && (!CallbackURI.Equals(""))) | 444 | if ((CallbackURI != null) && (!CallbackURI.Equals(""))) |
446 | args["callback_uri"] = OSD.FromString(CallbackURI); | 445 | args["callback_uri"] = OSD.FromString(CallbackURI); |
447 | 446 | ||
@@ -593,7 +592,7 @@ namespace OpenSim.Framework | |||
593 | // AgentTextures[i++] = o.AsUUID(); | 592 | // AgentTextures[i++] = o.AsUUID(); |
594 | //} | 593 | //} |
595 | 594 | ||
596 | Appearance = new AvatarAppearance(AgentID); | 595 | Appearance = new AvatarAppearance(); |
597 | 596 | ||
598 | // The code to unpack textures, visuals, wearables and attachments | 597 | // The code to unpack textures, visuals, wearables and attachments |
599 | // should be removed; packed appearance contains the full appearance | 598 | // should be removed; packed appearance contains the full appearance |
@@ -628,6 +627,7 @@ namespace OpenSim.Framework | |||
628 | // We know all of these must end up as attachments so we | 627 | // We know all of these must end up as attachments so we |
629 | // append rather than replace to ensure multiple attachments | 628 | // append rather than replace to ensure multiple attachments |
630 | // per point continues to work | 629 | // per point continues to work |
630 | // m_log.DebugFormat("[CHILDAGENTDATAUPDATE]: Appending attachments for {0}", AgentID); | ||
631 | Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o)); | 631 | Appearance.AppendAttachment(new AvatarAttachment((OSDMap)o)); |
632 | } | 632 | } |
633 | } | 633 | } |
@@ -635,7 +635,7 @@ namespace OpenSim.Framework | |||
635 | // end of code to remove | 635 | // end of code to remove |
636 | 636 | ||
637 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map) | 637 | if (args.ContainsKey("packed_appearance") && (args["packed_appearance"]).Type == OSDType.Map) |
638 | Appearance = new AvatarAppearance(AgentID,(OSDMap)args["packed_appearance"]); | 638 | Appearance = new AvatarAppearance((OSDMap)args["packed_appearance"]); |
639 | else | 639 | else |
640 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance"); | 640 | m_log.WarnFormat("[CHILDAGENTDATAUPDATE] No packed appearance"); |
641 | 641 | ||