aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorSean Dague2009-02-09 21:47:55 +0000
committerSean Dague2009-02-09 21:47:55 +0000
commit8088802c218d7eb4a47018b5b3bb70e7463a03b1 (patch)
treeac22b97c3dce09a91bae18b5840f8654813dcfc8 /OpenSim/Region/Framework/Scenes
parentThank you kindly, TLaukkan (Tommil) for a patch that: (diff)
downloadopensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.zip
opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.tar.gz
opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.tar.bz2
opensim-SC_OLD-8088802c218d7eb4a47018b5b3bb70e7463a03b1.tar.xz
From Alan Webb <awebb@linux.vnet.ibm.com>
These changes replace all direct references to the AssetCache with IAssetCache. There is no change to functionality. Everything works as before. This is laying the groundwork for making it possible to register alternative asset caching mechanisms without disrupting other parts of OpenSim or their dependencies upon AssetCache functionality.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneBase.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs2
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
index f36075e..ba81270 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
58 58
59 public HGScene(RegionInfo regInfo, AgentCircuitManager authen, 59 public HGScene(RegionInfo regInfo, AgentCircuitManager authen,
60 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 60 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
61 AssetCache assetCach, StorageManager storeManager, 61 IAssetCache assetCach, StorageManager storeManager,
62 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 62 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
63 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 63 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
64 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader, 64 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader,
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 55fc02a..2fae8ac 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Framework.Scenes
272 272
273 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 273 public Scene(RegionInfo regInfo, AgentCircuitManager authen,
274 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 274 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
275 AssetCache assetCach, StorageManager storeManager, 275 IAssetCache assetCach, StorageManager storeManager,
276 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 276 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
277 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 277 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
278 { 278 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index cee9037..b0f328d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -126,9 +126,9 @@ namespace OpenSim.Region.Framework.Scenes
126 126
127 protected string m_datastore; 127 protected string m_datastore;
128 128
129 private AssetCache m_assetCache; 129 private IAssetCache m_assetCache;
130 130
131 public AssetCache AssetCache 131 public IAssetCache AssetCache
132 { 132 {
133 get { return m_assetCache; } 133 get { return m_assetCache; }
134 set { m_assetCache = value; } 134 set { m_assetCache = value; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index efd486d..c15ac47 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Framework.Scenes
251 m_part.ScheduleFullUpdate(); 251 m_part.ScheduleFullUpdate();
252 return; 252 return;
253 } 253 }
254 AssetCache cache = m_part.ParentGroup.Scene.AssetCache; 254 IAssetCache cache = m_part.ParentGroup.Scene.AssetCache;
255 255
256 cache.GetAsset(item.AssetID, delegate(UUID assetID, AssetBase asset) 256 cache.GetAsset(item.AssetID, delegate(UUID assetID, AssetBase asset)
257 { 257 {