Minor tweaks to get OpenSim compiling against both the current libomv and the upcoming 0.8.0

0.6.8-post-fixes
John Hurliman 2009-10-25 01:01:26 -07:00
parent 730930955a
commit de25dcfb7b
2 changed files with 3 additions and 1 deletions

View File

@ -30,6 +30,8 @@ using System.Collections.Generic;
using OpenSim.Framework; using OpenSim.Framework;
using OpenMetaverse; using OpenMetaverse;
using Animation = OpenSim.Framework.Animation;
namespace OpenSim.Region.Framework.Scenes namespace OpenSim.Region.Framework.Scenes
{ {
[Serializable] [Serializable]

View File

@ -2693,7 +2693,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (m_scene.AssetService.Get(face.TextureID.ToString()) == null) 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); this.ControllingClient.SendRebakeAvatarTextures(face.TextureID);
} }
} }