aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-25 01:01:26 -0700
committerJohn Hurliman2009-10-25 01:01:26 -0700
commit593ce2e1fb0530d91a66006ad069d2916d482cd2 (patch)
tree20a50877629f2e128afaa387faaf049e61bdb632 /OpenSim
parentChanging Scene.ForEachClient to use the synchronous for loop instead of Paral... (diff)
downloadopensim-SC_OLD-593ce2e1fb0530d91a66006ad069d2916d482cd2.zip
opensim-SC_OLD-593ce2e1fb0530d91a66006ad069d2916d482cd2.tar.gz
opensim-SC_OLD-593ce2e1fb0530d91a66006ad069d2916d482cd2.tar.bz2
opensim-SC_OLD-593ce2e1fb0530d91a66006ad069d2916d482cd2.tar.xz
Minor tweaks to get OpenSim compiling against both the current libomv and the upcoming 0.8.0
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/AnimationSet.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Tools/pCampBot/PhysicsBot.cs2
3 files changed, 4 insertions, 2 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;
30using OpenSim.Framework; 30using OpenSim.Framework;
31using OpenMetaverse; 31using OpenMetaverse;
32 32
33using Animation = OpenSim.Framework.Animation;
34
33namespace OpenSim.Region.Framework.Scenes 35namespace 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 }
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
271 string[] bodyparts = Directory.GetFiles(saveDir, "*.bodypart", SearchOption.TopDirectoryOnly); 271 string[] bodyparts = Directory.GetFiles(saveDir, "*.bodypart", SearchOption.TopDirectoryOnly);
272 InventoryFolder clothfolder = FindClothingFolder(); 272 InventoryFolder clothfolder = FindClothingFolder();
273 UUID transid = UUID.Random(); 273 UUID transid = UUID.Random();
274 List<InventoryBase> listwearables = new List<InventoryBase>(); 274 List<InventoryItem> listwearables = new List<InventoryItem>();
275 275
276 for (int i = 0; i < clothing.Length; i++) 276 for (int i = 0; i < clothing.Length; i++)
277 { 277 {