From da794f34a56f7c88904315ae538de8f3790e6891 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Wed, 19 Oct 2011 14:41:44 -0700
Subject: Renamed and rearranged AvatarFactoryModule to eliminate redundant
 lookups of scene presence by client ID.

---
 OpenSim/Region/Framework/Scenes/Scene.cs         | 6 +++---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 8a32e1d..724c635 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         protected IXMLRPC m_xmlrpcModule;
         protected IWorldComm m_worldCommModule;
-        protected IAvatarFactory m_AvatarFactory;
+        protected IAvatarFactoryModule m_AvatarFactory;
         protected IConfigSource m_config;
         protected IRegionSerialiserModule m_serialiser;
         protected IDialogModule m_dialogModule;
@@ -444,7 +444,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public IAttachmentsModule AttachmentsModule { get; set; }
 
-        public IAvatarFactory AvatarFactory
+        public IAvatarFactoryModule AvatarFactory
         {
             get { return m_AvatarFactory; }
         }
@@ -1154,7 +1154,7 @@ namespace OpenSim.Region.Framework.Scenes
             m_xmlrpcModule = RequestModuleInterface<IXMLRPC>();
             m_worldCommModule = RequestModuleInterface<IWorldComm>();
             XferManager = RequestModuleInterface<IXfer>();
-            m_AvatarFactory = RequestModuleInterface<IAvatarFactory>();
+            m_AvatarFactory = RequestModuleInterface<IAvatarFactoryModule>();
             AttachmentsModule = RequestModuleInterface<IAttachmentsModule>();
             m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
             m_dialogModule = RequestModuleInterface<IDialogModule>();
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index e0fd84a..464f8f0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2538,7 +2538,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)
-- 
cgit v1.1