diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index ccc6861..a9aa7c4 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -587,10 +587,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
587 | } | 587 | } |
588 | 588 | ||
589 | if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE) | 589 | if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE) |
590 | { | ||
591 | defonly = false; // found a non-default texture reference | ||
592 | continue; | 590 | continue; |
593 | } | ||
594 | 591 | ||
595 | if (wearableCache[idx].TextureID != face.TextureID) | 592 | if (wearableCache[idx].TextureID != face.TextureID) |
596 | { | 593 | { |
@@ -603,7 +600,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
603 | wearableCache[idx].TextureAsset = null; | 600 | wearableCache[idx].TextureAsset = null; |
604 | if (cache != null) | 601 | if (cache != null) |
605 | { | 602 | { |
606 | wearableCache[idx].TextureAsset = m_scene.AssetService.Get(face.TextureID.ToString()); | 603 | wearableCache[idx].TextureAsset = m_scene.AssetService.GetCached(face.TextureID.ToString()); |
607 | if (wearableCache[idx].TextureAsset == null) | 604 | if (wearableCache[idx].TextureAsset == null) |
608 | { | 605 | { |
609 | wearableCache[idx].CacheId = UUID.Zero; | 606 | wearableCache[idx].CacheId = UUID.Zero; |
@@ -611,6 +608,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
611 | } | 608 | } |
612 | else | 609 | else |
613 | hits++; | 610 | hits++; |
611 | defonly = false; // found a non-default texture reference | ||
614 | } | 612 | } |
615 | } | 613 | } |
616 | } | 614 | } |
@@ -630,7 +628,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
630 | } | 628 | } |
631 | 629 | ||
632 | // If we only found default textures, then the appearance is not cached | 630 | // If we only found default textures, then the appearance is not cached |
633 | return (defonly ? false : true); | 631 | // return (defonly ? false : true); |
632 | return (hits >= AvatarAppearance.BAKE_INDICES.Length - 1); // skirt is optional | ||
634 | } | 633 | } |
635 | public int RequestRebake(IScenePresence sp, bool missingTexturesOnly) | 634 | public int RequestRebake(IScenePresence sp, bool missingTexturesOnly) |
636 | { | 635 | { |