Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 9 insertions, 9 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 9513408..33489d1 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 
             // TODO: Use the actual BunchOfCaps functionality once we slot in the CapabilitiesModules
             AssetBase bakedTextureAsset;
-            bakedTextureAsset 
+            bakedTextureAsset
                 = new AssetBase(
                     bakedTextureID, "Test Baked Texture", (sbyte)AssetType.Texture, userId.ToString());
             bakedTextureAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // This is the alpha texture
             eyesFace.TextureID = bakedTextureID;
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
-    
+
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
 
             AssetBase eyesBake = scene.AssetService.Get(bakedTextureID.ToString());
@@ -98,7 +98,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
         /// Test appearance setting where the baked texture UUID are library alpha textures.
         /// </summary>
         /// <remarks>
-        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to 
+        /// For a mesh avatar, it appears these 'baked textures' are used.  So these should not trigger a request to
         /// rebake.
         /// </remarks>
         [Test]
@@ -113,14 +113,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
             ScenePresence sp = SceneHelpers.AddScenePresence(scene, userId);
 
             AssetBase libraryAsset;
-            libraryAsset 
+            libraryAsset
                 = new AssetBase(
                     alphaTextureID, "Default Alpha Layer Texture", (sbyte)AssetType.Texture, userId.ToString());
             libraryAsset.Data = new byte[] { 2 }; // Not necessary to have a genuine JPEG2000 asset here yet
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // This is the alpha texture
             eyesFace.TextureID = alphaTextureID;
             afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
-    
+
             Assert.That(rebakeRequestsReceived, Is.EqualTo(0));
         }
 
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             // We need an asset cache because otherwise the LocalAssetServiceConnector will short-circuit directly
             // to the AssetService, which will then store temporary and local assets permanently
             CoreAssetCache assetCache = new CoreAssetCache();
-            
+
             AvatarFactoryModule afm = new AvatarFactoryModule();
             TestScene scene = new SceneHelpers(assetCache).SetupScene();
             SceneHelpers.SetupSceneModules(scene, afm);
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
             Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex);
             eyesFace.TextureID = eyesTextureId;
 
-            afm.SetAppearance(sp, bakedTextureEntry, visualParams, null);
+            afm.SetAppearance(sp, bakedTextureEntry, visualParams, new WearableCacheItem[0]);
             afm.SaveBakedTextures(userId);
 //            Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId);