From de25dcfb7b28c81b7bce187165be81f65b849a7c Mon Sep 17 00:00:00 2001
From: John Hurliman <jhurliman@jhurliman.org>
Date: Sun, 25 Oct 2009 01:01:26 -0700
Subject: [PATCH] Minor tweaks to get OpenSim compiling against both the
 current libomv and the upcoming 0.8.0

---
 OpenSim/Region/Framework/Scenes/AnimationSet.cs  | 2 ++
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/Framework/Scenes/AnimationSet.cs b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
index aa0c8b84fa..740d168c09 100644
--- a/OpenSim/Region/Framework/Scenes/AnimationSet.cs
+++ b/OpenSim/Region/Framework/Scenes/AnimationSet.cs
@@ -30,6 +30,8 @@ using System.Collections.Generic;
 using OpenSim.Framework;
 using OpenMetaverse;
 
+using Animation = OpenSim.Framework.Animation;
+
 namespace OpenSim.Region.Framework.Scenes
 {
     [Serializable]
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index a610e42890..67384fb711 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2693,7 +2693,7 @@ namespace OpenSim.Region.Framework.Scenes
                     {
                         if (m_scene.AssetService.Get(face.TextureID.ToString()) == null)
                         {
-                            m_log.Warn("[APPEARANCE]: Missing baked texture " + face.TextureID + " (" + (AppearanceManager.TextureIndex)j + ") for avatar " + this.Name);
+                            m_log.Warn("[APPEARANCE]: Missing baked texture " + face.TextureID + " (" + j + ") for avatar " + this.Name);
                             this.ControllingClient.SendRebakeAvatarTextures(face.TextureID);
                         }
                     }