diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index edf62db..2e5c58a 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -493,18 +493,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
493 | 493 | ||
494 | wearableCache = WearableCacheItem.GetDefaultCacheItem(); | 494 | wearableCache = WearableCacheItem.GetDefaultCacheItem(); |
495 | 495 | ||
496 | // debug | 496 | int hits = 0; |
497 | for (int iter = 0; iter < AvatarAppearance.BAKE_INDICES.Length; iter++) | ||
498 | { | ||
499 | int j = AvatarAppearance.BAKE_INDICES[iter]; | ||
500 | Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[iter]; | ||
501 | if(face != null) | ||
502 | m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t - " + face.TextureID); | ||
503 | else | ||
504 | m_log.Debug("[ValidateBakedCache] {" + iter + "/" + j + " t - No texture"); | ||
505 | } | ||
506 | |||
507 | int hits = 0; | ||
508 | // Cache wearable data for teleport. | 497 | // Cache wearable data for teleport. |
509 | // Only makes sense if there's a bake module and a cache module | 498 | // Only makes sense if there's a bake module and a cache module |
510 | if (bakedModule != null && cache != null) | 499 | if (bakedModule != null && cache != null) |
@@ -546,7 +535,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
546 | int idx = AvatarAppearance.BAKE_INDICES[i]; | 535 | int idx = AvatarAppearance.BAKE_INDICES[i]; |
547 | Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx]; | 536 | Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[idx]; |
548 | 537 | ||
549 | // No face, so lets check our baked service cache, teleport or login. | 538 | // No face, so lets check our cache |
550 | if (face == null || face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE) | 539 | if (face == null || face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE) |
551 | { | 540 | { |
552 | sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx); | 541 | sp.Appearance.Texture.FaceTextures[idx] = sp.Appearance.Texture.CreateFace((uint)idx); |
@@ -560,8 +549,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
560 | { | 549 | { |
561 | sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE; | 550 | sp.Appearance.Texture.FaceTextures[idx].TextureID = AppearanceManager.DEFAULT_AVATAR_TEXTURE; |
562 | face = sp.Appearance.Texture.FaceTextures[idx]; | 551 | face = sp.Appearance.Texture.FaceTextures[idx]; |
563 | wearableCache[idx].CacheId = UUID.Zero; | 552 | // lets try not invalidating the cache entry |
564 | wearableCache[idx].TextureAsset = null; | 553 | // wearableCache[idx].CacheId = UUID.Zero; |
554 | // wearableCache[idx].TextureAsset = null; | ||
565 | continue; | 555 | continue; |
566 | } | 556 | } |
567 | } | 557 | } |
@@ -624,14 +614,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
624 | if (face == null) | 614 | if (face == null) |
625 | continue; | 615 | continue; |
626 | 616 | ||
627 | // m_log.DebugFormat( | ||
628 | // "[AVFACTORY]: Looking for texture {0}, id {1} for {2} {3}", | ||
629 | // face.TextureID, idx, client.Name, client.AgentId); | ||
630 | |||
631 | // if the texture is one of the "defaults" then skip it | ||
632 | // this should probably be more intelligent (skirt texture doesnt matter | ||
633 | // if the avatar isnt wearing a skirt) but if any of the main baked | ||
634 | // textures is default then the rest should be as well | ||
635 | if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE) | 617 | if (face.TextureID == UUID.Zero || face.TextureID == AppearanceManager.DEFAULT_AVATAR_TEXTURE) |
636 | continue; | 618 | continue; |
637 | 619 | ||