From 593ce2e1fb0530d91a66006ad069d2916d482cd2 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Sun, 25 Oct 2009 01:01:26 -0700
Subject: 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 +-
 OpenSim/Tools/pCampBot/PhysicsBot.cs             | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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;
 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 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
                     {
                         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);
                         }
                     }
diff --git a/OpenSim/Tools/pCampBot/PhysicsBot.cs b/OpenSim/Tools/pCampBot/PhysicsBot.cs
index 426ef29..9cdbf32 100644
--- a/OpenSim/Tools/pCampBot/PhysicsBot.cs
+++ b/OpenSim/Tools/pCampBot/PhysicsBot.cs
@@ -271,7 +271,7 @@ namespace pCampBot
                 string[] bodyparts = Directory.GetFiles(saveDir, "*.bodypart", SearchOption.TopDirectoryOnly);
                 InventoryFolder clothfolder = FindClothingFolder();
                 UUID transid = UUID.Random();
-                List<InventoryBase> listwearables = new List<InventoryBase>();
+                List<InventoryItem> listwearables = new List<InventoryItem>();
                 
                 for (int i = 0; i < clothing.Length; i++)
                 {
-- 
cgit v1.1