aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorUbitUmarov2014-10-26 18:13:44 +0000
committerUbitUmarov2014-10-26 18:13:44 +0000
commit736490dcb60047e6060c13c990f13dc0c1bf0ea6 (patch)
tree12f569d659f82b8f2265ae4378c1225e5628b2c3 /OpenSim/Region/CoreModules
parentremove debug message (diff)
downloadopensim-SC_OLD-736490dcb60047e6060c13c990f13dc0c1bf0ea6.zip
opensim-SC_OLD-736490dcb60047e6060c13c990f13dc0c1bf0ea6.tar.gz
opensim-SC_OLD-736490dcb60047e6060c13c990f13dc0c1bf0ea6.tar.bz2
opensim-SC_OLD-736490dcb60047e6060c13c990f13dc0c1bf0ea6.tar.xz
dont send baked textures assets, but send cache information
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs18
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index bd243ad..297044f 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -547,12 +547,20 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
547 { 547 {
548 int idx = AvatarAppearance.BAKE_INDICES[i]; 548 int idx = AvatarAppearance.BAKE_INDICES[i];
549 Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx]; 549 Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx];
550 if (face != null && face.TextureID == wearableCache[idx].TextureID && wearableCache[idx].TextureAsset != null) 550 if (face != null && face.TextureID == wearableCache[idx].TextureID)
551 { 551 {
552 hits++; 552 if (wearableCache[idx].TextureAsset != null)
553 wearableCache[idx].TextureAsset.Temporary = true; 553 {
554 wearableCache[idx].TextureAsset.Local = true; 554 hits++;
555 cache.Store(wearableCache[idx].TextureAsset); 555 wearableCache[idx].TextureAsset.Temporary = true;
556 wearableCache[idx].TextureAsset.Local = true;
557 cache.Store(wearableCache[idx].TextureAsset);
558
559 }
560 else if (cache.GetCached((wearableCache[idx].TextureID).ToString()) != null)
561 {
562 hits++;
563 }
556 } 564 }
557 } 565 }
558 566