diff options
author | Justin Clark-Casey (justincc) | 2011-08-02 00:13:04 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-02 00:13:04 +0100 |
commit | b6ac1c46cd473b129b70344f0001f1e8f97d8860 (patch) | |
tree | 46e5d02205b63d16f29b3aaf6a3ad910192aaeb6 /OpenSim/Framework/ChildAgentDataUpdate.cs | |
parent | Get osNpcCreate appearance working with avatars that are currently in the scene. (diff) | |
download | opensim-SC-b6ac1c46cd473b129b70344f0001f1e8f97d8860.zip opensim-SC-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.gz opensim-SC-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.bz2 opensim-SC-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.xz |
Get rid of AvatarAppearance.Owner to simplify the code.
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
Diffstat (limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')
-rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 710a57d..613db1c 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
@@ -593,7 +593,7 @@ namespace OpenSim.Framework | |||
593 | // AgentTextures[i++] = o.AsUUID(); | 593 | // AgentTextures[i++] = o.AsUUID(); |
594 | //} | 594 | //} |
595 | 595 | ||
596 | Appearance = new AvatarAppearance(AgentID); | 596 | Appearance = new AvatarAppearance(); |
597 | 597 | ||
598 | // The code to unpack textures, visuals, wearables and attachments | 598 | // The code to unpack textures, visuals, wearables and attachments |
599 | // should be removed; packed appearance contains the full appearance | 599 | // should be removed; packed appearance contains the full appearance |
@@ -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 | ||