aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs (renamed from OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs)9
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
3 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
index 4dbddf4..98228e4 100644
--- a/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactoryModule.cs
@@ -31,8 +31,11 @@ using OpenSim.Framework;
31 31
32namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IAvatarFactory 34 public interface IAvatarFactoryModule
35 { 35 {
36
37 void SetAppearance(IScenePresence sp, Primitive.TextureEntry textureEntry, byte[] visualParams);
38
36 /// <summary> 39 /// <summary>
37 /// Send the appearance of an avatar to others in the scene. 40 /// Send the appearance of an avatar to others in the scene.
38 /// </summary> 41 /// </summary>
@@ -57,7 +60,7 @@ namespace OpenSim.Region.Framework.Interfaces
57 /// <returns>true if a valid agent was found, false otherwise</returns> 60 /// <returns>true if a valid agent was found, false otherwise</returns>
58 bool SaveBakedTextures(UUID agentId); 61 bool SaveBakedTextures(UUID agentId);
59 62
60 bool ValidateBakedTextureCache(IClientAPI client); 63 bool ValidateBakedTextureCache(IScenePresence sp);
61 void QueueAppearanceSend(UUID agentid); 64 void QueueAppearanceSend(UUID agentid);
62 void QueueAppearanceSave(UUID agentid); 65 void QueueAppearanceSave(UUID agentid);
63 } 66 }
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
135 135
136 protected IXMLRPC m_xmlrpcModule; 136 protected IXMLRPC m_xmlrpcModule;
137 protected IWorldComm m_worldCommModule; 137 protected IWorldComm m_worldCommModule;
138 protected IAvatarFactory m_AvatarFactory; 138 protected IAvatarFactoryModule m_AvatarFactory;
139 protected IConfigSource m_config; 139 protected IConfigSource m_config;
140 protected IRegionSerialiserModule m_serialiser; 140 protected IRegionSerialiserModule m_serialiser;
141 protected IDialogModule m_dialogModule; 141 protected IDialogModule m_dialogModule;
@@ -444,7 +444,7 @@ namespace OpenSim.Region.Framework.Scenes
444 444
445 public IAttachmentsModule AttachmentsModule { get; set; } 445 public IAttachmentsModule AttachmentsModule { get; set; }
446 446
447 public IAvatarFactory AvatarFactory 447 public IAvatarFactoryModule AvatarFactory
448 { 448 {
449 get { return m_AvatarFactory; } 449 get { return m_AvatarFactory; }
450 } 450 }
@@ -1154,7 +1154,7 @@ namespace OpenSim.Region.Framework.Scenes
1154 m_xmlrpcModule = RequestModuleInterface<IXMLRPC>(); 1154 m_xmlrpcModule = RequestModuleInterface<IXMLRPC>();
1155 m_worldCommModule = RequestModuleInterface<IWorldComm>(); 1155 m_worldCommModule = RequestModuleInterface<IWorldComm>();
1156 XferManager = RequestModuleInterface<IXfer>(); 1156 XferManager = RequestModuleInterface<IXfer>();
1157 m_AvatarFactory = RequestModuleInterface<IAvatarFactory>(); 1157 m_AvatarFactory = RequestModuleInterface<IAvatarFactoryModule>();
1158 AttachmentsModule = RequestModuleInterface<IAttachmentsModule>(); 1158 AttachmentsModule = RequestModuleInterface<IAttachmentsModule>();
1159 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>(); 1159 m_serialiser = RequestModuleInterface<IRegionSerialiserModule>();
1160 m_dialogModule = RequestModuleInterface<IDialogModule>(); 1160 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
2538 // We have an appearance but we may not have the baked textures. Check the asset cache 2538 // We have an appearance but we may not have the baked textures. Check the asset cache
2539 // to see if all the baked textures are already here. 2539 // to see if all the baked textures are already here.
2540 if (m_scene.AvatarFactory != null) 2540 if (m_scene.AvatarFactory != null)
2541 cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(ControllingClient); 2541 cachedappearance = m_scene.AvatarFactory.ValidateBakedTextureCache(this);
2542 2542
2543 // If we aren't using a cached appearance, then clear out the baked textures 2543 // If we aren't using a cached appearance, then clear out the baked textures
2544 if (!cachedappearance) 2544 if (!cachedappearance)