diff options
author | Justin Clark-Casey (justincc) | 2011-08-01 23:41:29 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-01 23:41:29 +0100 |
commit | 59f548cda82facef003fb7309180412254a234a1 (patch) | |
tree | ee736eca64d23b35dbd3aa0e18f1b2311804ff43 /OpenSim/Region/Framework/Scenes | |
parent | Move common gemo/agent map name code into CreateGeom() (diff) | |
download | opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.zip opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.tar.gz opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.tar.bz2 opensim-SC_OLD-59f548cda82facef003fb7309180412254a234a1.tar.xz |
Get osNpcCreate appearance working with avatars that are currently in the scene.
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing).
Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing.
Extended TestCreate() to check this.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 83b761c..1e121d9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2647,7 +2647,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2647 | /// <param name="avatar"></param> | 2647 | /// <param name="avatar"></param> |
2648 | public void SendAppearanceToAgent(ScenePresence avatar) | 2648 | public void SendAppearanceToAgent(ScenePresence avatar) |
2649 | { | 2649 | { |
2650 | // m_log.WarnFormat("[SP] Send appearance from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); | 2650 | // m_log.DebugFormat( |
2651 | // "[SCENE PRESENCE] Send appearance from {0} {1} to {2} {3}", Name, m_uuid, avatar.Name, avatar.UUID); | ||
2651 | 2652 | ||
2652 | avatar.ControllingClient.SendAppearance( | 2653 | avatar.ControllingClient.SendAppearance( |
2653 | m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); | 2654 | m_appearance.Owner, m_appearance.VisualParams, m_appearance.Texture.GetBytes()); |
@@ -2659,7 +2660,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
2659 | public AvatarAppearance Appearance | 2660 | public AvatarAppearance Appearance |
2660 | { | 2661 | { |
2661 | get { return m_appearance; } | 2662 | get { return m_appearance; } |
2662 | set { m_appearance = value; } | 2663 | set |
2664 | { | ||
2665 | m_appearance = value; | ||
2666 | // m_log.DebugFormat("[SCENE PRESENCE]: Set appearance for {0} to {1}", Name, value); | ||
2667 | } | ||
2663 | } | 2668 | } |
2664 | 2669 | ||
2665 | #endregion | 2670 | #endregion |