diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs index 9513408..b7ff4e0 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs | |||
@@ -132,6 +132,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
132 | for (byte i = 0; i < visualParams.Length; i++) | 132 | for (byte i = 0; i < visualParams.Length; i++) |
133 | visualParams[i] = i; | 133 | visualParams[i] = i; |
134 | 134 | ||
135 | <<<<<<< HEAD | ||
135 | Primitive.TextureEntry bakedTextureEntry = new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)); | 136 | Primitive.TextureEntry bakedTextureEntry = new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)); |
136 | uint eyesFaceIndex = (uint)AppearanceManager.BakeTypeToAgentTextureIndex(BakeType.Eyes); | 137 | uint eyesFaceIndex = (uint)AppearanceManager.BakeTypeToAgentTextureIndex(BakeType.Eyes); |
137 | Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex); | 138 | Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex); |
@@ -144,6 +145,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
144 | afm.SetAppearance(sp, bakedTextureEntry, visualParams, null); | 145 | afm.SetAppearance(sp, bakedTextureEntry, visualParams, null); |
145 | 146 | ||
146 | Assert.That(rebakeRequestsReceived, Is.EqualTo(0)); | 147 | Assert.That(rebakeRequestsReceived, Is.EqualTo(0)); |
148 | ======= | ||
149 | afm.SetAppearance(sp, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams, new WearableCacheItem[0]); | ||
150 | |||
151 | // TODO: Check baked texture | ||
152 | Assert.AreEqual(visualParams, sp.Appearance.VisualParams); | ||
153 | >>>>>>> avn/ubitvar | ||
147 | } | 154 | } |
148 | 155 | ||
149 | [Test] | 156 | [Test] |
@@ -181,7 +188,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
181 | Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex); | 188 | Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex); |
182 | eyesFace.TextureID = eyesTextureId; | 189 | eyesFace.TextureID = eyesTextureId; |
183 | 190 | ||
191 | <<<<<<< HEAD | ||
184 | afm.SetAppearance(sp, bakedTextureEntry, visualParams, null); | 192 | afm.SetAppearance(sp, bakedTextureEntry, visualParams, null); |
193 | ======= | ||
194 | afm.SetAppearance(sp, bakedTextureEntry, visualParams, new WearableCacheItem[0]); | ||
195 | >>>>>>> avn/ubitvar | ||
185 | afm.SaveBakedTextures(userId); | 196 | afm.SaveBakedTextures(userId); |
186 | // Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId); | 197 | // Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId); |
187 | 198 | ||