diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/AnimationSet.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs index aa0c8b8..740d168 100644 --- a/OpenSim/Region/Framework/Scenes/AnimationSet.cs +++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs | |||
@@ -30,6 +30,8 @@ using System.Collections.Generic; | |||
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenMetaverse; | 31 | using OpenMetaverse; |
32 | 32 | ||
33 | using Animation = OpenSim.Framework.Animation; | ||
34 | |||
33 | namespace OpenSim.Region.Framework.Scenes | 35 | namespace OpenSim.Region.Framework.Scenes |
34 | { | 36 | { |
35 | [Serializable] | 37 | [Serializable] |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index a610e42..67384fb 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2693,7 +2693,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2693 | { | 2693 | { |
2694 | if (m_scene.AssetService.Get(face.TextureID.ToString()) == null) | 2694 | if (m_scene.AssetService.Get(face.TextureID.ToString()) == null) |
2695 | { | 2695 | { |
2696 | m_log.Warn("[APPEARANCE]: Missing baked texture " + face.TextureID + " (" + (AppearanceManager.TextureIndex)j + ") for avatar " + this.Name); | 2696 | m_log.Warn("[APPEARANCE]: Missing baked texture " + face.TextureID + " (" + j + ") for avatar " + this.Name); |
2697 | this.ControllingClient.SendRebakeAvatarTextures(face.TextureID); | 2697 | this.ControllingClient.SendRebakeAvatarTextures(face.TextureID); |
2698 | } | 2698 | } |
2699 | } | 2699 | } |