diff options
author | Justin Clark-Casey (justincc) | 2014-02-24 19:30:33 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-02-24 19:30:33 +0000 |
commit | bc9952f9010f714f645288cd9abc4e43622e1350 (patch) | |
tree | 5462aacd7073c4e12ecee0be197772e127a1cdd1 /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
parent | Stop mesh avatars that specify the alpha texture in their bake slots from cau... (diff) | |
download | opensim-SC_OLD-bc9952f9010f714f645288cd9abc4e43622e1350.zip opensim-SC_OLD-bc9952f9010f714f645288cd9abc4e43622e1350.tar.gz opensim-SC_OLD-bc9952f9010f714f645288cd9abc4e43622e1350.tar.bz2 opensim-SC_OLD-bc9952f9010f714f645288cd9abc4e43622e1350.tar.xz |
Re-enable regression TestSaveBakedTextures()
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs index 2019726..b1f26ef 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs | |||
@@ -102,8 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
102 | Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex); | 102 | Primitive.TextureEntryFace eyesFace = bakedTextureEntry.CreateFace(eyesFaceIndex); |
103 | eyesFace.TextureID = eyesTextureId; | 103 | eyesFace.TextureID = eyesTextureId; |
104 | 104 | ||
105 | /* | 105 | afm.SetAppearance(sp, bakedTextureEntry, visualParams, null); |
106 | afm.SetAppearance(sp, bakedTextureEntry, visualParams); | ||
107 | afm.SaveBakedTextures(userId); | 106 | afm.SaveBakedTextures(userId); |
108 | // Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId); | 107 | // Dictionary<BakeType, Primitive.TextureEntryFace> bakedTextures = afm.GetBakedTextureFaces(userId); |
109 | 108 | ||
@@ -114,7 +113,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
114 | Assert.That(eyesBake, Is.Not.Null); | 113 | Assert.That(eyesBake, Is.Not.Null); |
115 | Assert.That(eyesBake.Temporary, Is.False); | 114 | Assert.That(eyesBake.Temporary, Is.False); |
116 | Assert.That(eyesBake.Local, Is.False); | 115 | Assert.That(eyesBake.Local, Is.False); |
117 | */ | ||
118 | } | 116 | } |
119 | 117 | ||
120 | /// <summary> | 118 | /// <summary> |
@@ -128,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
128 | public void TestSetAppearanceAlphaBakedTextures() | 126 | public void TestSetAppearanceAlphaBakedTextures() |
129 | { | 127 | { |
130 | TestHelpers.InMethod(); | 128 | TestHelpers.InMethod(); |
131 | TestHelpers.EnableLogging(); | 129 | // TestHelpers.EnableLogging(); |
132 | 130 | ||
133 | UUID userId = TestHelpers.ParseTail(0x1); | 131 | UUID userId = TestHelpers.ParseTail(0x1); |
134 | UUID alphaTextureID = new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); | 132 | UUID alphaTextureID = new UUID("3a367d1c-bef1-6d43-7595-e88c1e3aadb3"); |