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/AgentCircuitData.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/AgentCircuitData.cs')
-rw-r--r-- | OpenSim/Framework/AgentCircuitData.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs index 125910e..12c8ac0 100644 --- a/OpenSim/Framework/AgentCircuitData.cs +++ b/OpenSim/Framework/AgentCircuitData.cs | |||
@@ -296,11 +296,12 @@ namespace OpenSim.Framework | |||
296 | if (args["start_pos"] != null) | 296 | if (args["start_pos"] != null) |
297 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); | 297 | Vector3.TryParse(args["start_pos"].AsString(), out startpos); |
298 | 298 | ||
299 | m_log.InfoFormat("[AGENTCIRCUITDATA] agentid={0}, child={1}, startpos={2}",AgentID,child,startpos.ToString()); | 299 | m_log.InfoFormat("[AGENTCIRCUITDATA]: agentid={0}, child={1}, startpos={2}", AgentID, child, startpos); |
300 | 300 | ||
301 | try { | 301 | try |
302 | { | ||
302 | // Unpack various appearance elements | 303 | // Unpack various appearance elements |
303 | Appearance = new AvatarAppearance(AgentID); | 304 | Appearance = new AvatarAppearance(); |
304 | 305 | ||
305 | // Eventually this code should be deprecated, use full appearance | 306 | // Eventually this code should be deprecated, use full appearance |
306 | // packing in packed_appearance | 307 | // packing in packed_appearance |
@@ -313,7 +314,9 @@ namespace OpenSim.Framework | |||
313 | m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance"); | 314 | m_log.InfoFormat("[AGENTCIRCUITDATA] unpacked appearance"); |
314 | } | 315 | } |
315 | else | 316 | else |
316 | m_log.Warn("[AGENTCIRCUITDATA] failed to find a valid packed_appearance"); | 317 | { |
318 | m_log.Warn("[AGENTCIRCUITDATA]: failed to find a valid packed_appearance"); | ||
319 | } | ||
317 | } | 320 | } |
318 | catch (Exception e) | 321 | catch (Exception e) |
319 | { | 322 | { |