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/Region/Framework/Scenes/ScenePresence.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/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1e121d9..4739f5b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -916,7 +916,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
916 | { | 916 | { |
917 | m_log.ErrorFormat("[SCENE PRESENCE]: null appearance in MakeRoot in {0}", Scene.RegionInfo.RegionName); | 917 | m_log.ErrorFormat("[SCENE PRESENCE]: null appearance in MakeRoot in {0}", Scene.RegionInfo.RegionName); |
918 | // emergency; this really shouldn't happen | 918 | // emergency; this really shouldn't happen |
919 | m_appearance = new AvatarAppearance(UUID); | 919 | m_appearance = new AvatarAppearance(); |
920 | } | 920 | } |
921 | 921 | ||
922 | AddToPhysicalScene(isFlying); | 922 | AddToPhysicalScene(isFlying); |
@@ -2651,7 +2651,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2651 | // "[SCENE PRESENCE] Send appearance from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID); | 2651 | // "[SCENE PRESENCE] Send appearance from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID); |
2652 | 2652 | ||
2653 | avatar.ControllingClient.SendAppearance( | 2653 | avatar.ControllingClient.SendAppearance( |
2654 | m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); | 2654 | UUID, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); |
2655 | } | 2655 | } |
2656 | 2656 | ||
2657 | // Because appearance setting is in a module, we actually need | 2657 | // Because appearance setting is in a module, we actually need |