Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge

This commit is contained in:
Melanie
2011-10-25 03:16:47 +01:00
9 changed files with 319 additions and 344 deletions

View File

@@ -2890,7 +2890,7 @@ namespace OpenSim.Region.Framework.Scenes
// We have an appearance but we may not have the baked textures. Check the asset cache
// to see if all the baked textures are already here.
if (m_scene.AvatarFactory != null)
cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(ControllingClient);
cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
// If we aren't using a cached appearance, then clear out the baked textures
if (!cachedappearance)