aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Agent
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-16 19:15:16 +0000
committerJustin Clarke Casey2009-02-16 19:15:16 +0000
commit93837807ffb24e5811368063b9231a9d8b018d9d (patch)
tree5da8dcbc3fd6e6e4c7003e486f0ad26bd7c43d87 /OpenSim/Region/CoreModules/Agent
parent* Iniital inventory archive test code. Doesn't actually do any testing yet (diff)
downloadopensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.zip
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.gz
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.bz2
opensim-SC_OLD-93837807ffb24e5811368063b9231a9d8b018d9d.tar.xz
* refactor: remove AssetCache field hanging off Scene
* This is always available at Scene.CommsManager.AssetCache
Diffstat (limited to 'OpenSim/Region/CoreModules/Agent')
-rw-r--r--OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 6327466..2c6b51d 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
86 86
87 Caps caps 87 Caps caps
88 = new Caps( 88 = new Caps(
89 m_scene.AssetCache, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName, 89 m_scene.CommsManager.AssetCache, m_scene.CommsManager.HttpServer, m_scene.RegionInfo.ExternalHostName,
90 m_scene.CommsManager.HttpServer.Port, 90 m_scene.CommsManager.HttpServer.Port,
91 capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName); 91 capsObjectPath, agentId, m_scene.DumpAssetsToFile, m_scene.RegionInfo.RegionName);
92 92
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
index 2f98bab..ae71fda 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/UserTextureDownloadService.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
152 TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber); 152 TextureSender.TextureSender requestHandler = new TextureSender.TextureSender(m_client, e.DiscardLevel, e.PacketNumber);
153 m_textureSenders.Add(e.RequestedAssetID, requestHandler); 153 m_textureSenders.Add(e.RequestedAssetID, requestHandler);
154 154
155 m_scene.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true); 155 m_scene.CommsManager.AssetCache.GetAsset(e.RequestedAssetID, TextureCallback, true);
156 } 156 }
157 } 157 }
158 } 158 }