aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie2011-10-25 03:16:47 +0100
committerMelanie2011-10-25 03:16:47 +0100
commit04678836c32d8d639503fb762b46ff499366bd8c (patch)
treee6163a94be920589a7f89f96b8491b6b64c25938 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentMerge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge (diff)
parentRenamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ... (diff)
downloadopensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.zip
opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.gz
opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.bz2
opensim-SC-04678836c32d8d639503fb762b46ff499366bd8c.tar.xz
Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 941765d..02bceb9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2890,7 +2890,7 @@ namespace OpenSim.Region.Framework.Scenes
2890 // We have an appearance but we may not have the baked textures. Check the asset cache 2890 // We have an appearance but we may not have the baked textures. Check the asset cache
2891 // to see if all the baked textures are already here. 2891 // to see if all the baked textures are already here.
2892 if (m_scene.AvatarFactory != null) 2892 if (m_scene.AvatarFactory != null)
2893 cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(ControllingClient); 2893 cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
2894 2894
2895 // If we aren't using a cached appearance, then clear out the baked textures 2895 // If we aren't using a cached appearance, then clear out the baked textures
2896 if (!cachedappearance) 2896 if (!cachedappearance)