aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMic Bowman2013-05-24 13:25:25 -0700
committerMic Bowman2013-05-24 13:25:25 -0700
commitbb0ea250907e24fe22490406e855cdcd958ba148 (patch)
tree584199e5118a9f4c5ad5306ebd893512ca36114f /OpenSim/Region/CoreModules
parentThis is an experimental patch that adds support for comparing texture (diff)
downloadopensim-SC-bb0ea250907e24fe22490406e855cdcd958ba148.zip
opensim-SC-bb0ea250907e24fe22490406e855cdcd958ba148.tar.gz
opensim-SC-bb0ea250907e24fe22490406e855cdcd958ba148.tar.bz2
opensim-SC-bb0ea250907e24fe22490406e855cdcd958ba148.tar.xz
Protect one more update of the baked texture hashes.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 482bf6f..aea768e 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -214,8 +214,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
214 214
215 // Save the wearble hashes in the appearance 215 // Save the wearble hashes in the appearance
216 sp.Appearance.ResetTextureHashes(); 216 sp.Appearance.ResetTextureHashes();
217 foreach (CachedTextureRequestArg arg in hashes) 217 if (m_reusetextures)
218 sp.Appearance.SetTextureHash(arg.BakedTextureIndex,arg.WearableHashID); 218 {
219 foreach (CachedTextureRequestArg arg in hashes)
220 sp.Appearance.SetTextureHash(arg.BakedTextureIndex,arg.WearableHashID);
221 }
219 222
220 // This appears to be set only in the final stage of the appearance 223 // This appears to be set only in the final stage of the appearance
221 // update transaction. In theory, we should be able to do an immediate 224 // update transaction. In theory, we should be able to do an immediate