aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Capabilities/Caps.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/Caps.cs')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 24cf0b6..27395e3 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -34,6 +34,7 @@ using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using OpenSim.Framework.Servers.HttpServer; 36using OpenSim.Framework.Servers.HttpServer;
37using OpenSim.Services.Interfaces;
37 38
38// using OpenSim.Region.Framework.Interfaces; 39// using OpenSim.Region.Framework.Interfaces;
39 40
@@ -100,7 +101,7 @@ namespace OpenSim.Framework.Communications.Capabilities
100 //private string eventQueue = "0100/"; 101 //private string eventQueue = "0100/";
101 private IHttpServer m_httpListener; 102 private IHttpServer m_httpListener;
102 private UUID m_agentID; 103 private UUID m_agentID;
103 private IAssetCache m_assetCache; 104 private IAssetService m_assetCache;
104 private int m_eventQueueCount = 1; 105 private int m_eventQueueCount = 1;
105 private Queue<string> m_capsEventQueue = new Queue<string>(); 106 private Queue<string> m_capsEventQueue = new Queue<string>();
106 private bool m_dumpAssetsToFile; 107 private bool m_dumpAssetsToFile;
@@ -128,7 +129,7 @@ namespace OpenSim.Framework.Communications.Capabilities
128 public FetchInventoryDescendentsCAPS CAPSFetchInventoryDescendents = null; 129 public FetchInventoryDescendentsCAPS CAPSFetchInventoryDescendents = null;
129 public GetClientDelegate GetClient = null; 130 public GetClientDelegate GetClient = null;
130 131
131 public Caps(IAssetCache assetCache, IHttpServer httpServer, string httpListen, uint httpPort, string capsPath, 132 public Caps(IAssetService assetCache, IHttpServer httpServer, string httpListen, uint httpPort, string capsPath,
132 UUID agent, bool dumpAssetsToFile, string regionName) 133 UUID agent, bool dumpAssetsToFile, string regionName)
133 { 134 {
134 m_assetCache = assetCache; 135 m_assetCache = assetCache;
@@ -870,7 +871,7 @@ namespace OpenSim.Framework.Communications.Capabilities
870 if (AddNewAsset != null) 871 if (AddNewAsset != null)
871 AddNewAsset(asset); 872 AddNewAsset(asset);
872 else if (m_assetCache != null) 873 else if (m_assetCache != null)
873 m_assetCache.AddAsset(asset); 874 m_assetCache.Store(asset);
874 875
875 InventoryItemBase item = new InventoryItemBase(); 876 InventoryItemBase item = new InventoryItemBase();
876 item.Owner = m_agentID; 877 item.Owner = m_agentID;