OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 593ce2e1fb
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/AnimationSet.cs
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]

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
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);
} }
} }

2
OpenSim/Tools/pCampBot/PhysicsBot.cs
View File

@ -271,7 +271,7 @@ namespace pCampBot
string[] bodyparts = Directory.GetFiles(saveDir, "*.bodypart", SearchOption.TopDirectoryOnly); string[] bodyparts = Directory.GetFiles(saveDir, "*.bodypart", SearchOption.TopDirectoryOnly);
InventoryFolder clothfolder = FindClothingFolder(); InventoryFolder clothfolder = FindClothingFolder();
UUID transid = UUID.Random(); UUID transid = UUID.Random();
List<InventoryBase> listwearables = new List<InventoryBase>(); List<InventoryItem> listwearables = new List<InventoryItem>();
for (int i = 0; i < clothing.Length; i++) for (int i = 0; i < clothing.Length; i++)
{ {