diff options
Diffstat (limited to 'OpenSim/Framework/Communications/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Framework/Communications/Capabilities/Caps.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 4ab304f..fde44be 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -33,6 +33,7 @@ using System.Reflection; | |||
33 | using log4net; | 33 | using log4net; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenSim.Framework.Servers; | 35 | using OpenSim.Framework.Servers; |
36 | using OpenSim.Framework.Servers.Interfaces; | ||
36 | 37 | ||
37 | // using OpenSim.Region.Framework.Interfaces; | 38 | // using OpenSim.Region.Framework.Interfaces; |
38 | 39 | ||
@@ -95,7 +96,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
95 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. | 96 | // private static readonly string m_remoteParcelRequestPath = "0009/";// This is in the LandManagementModule. |
96 | 97 | ||
97 | //private string eventQueue = "0100/"; | 98 | //private string eventQueue = "0100/"; |
98 | private BaseHttpServer m_httpListener; | 99 | private IHttpServer m_httpListener; |
99 | private UUID m_agentID; | 100 | private UUID m_agentID; |
100 | private IAssetCache m_assetCache; | 101 | private IAssetCache m_assetCache; |
101 | private int m_eventQueueCount = 1; | 102 | private int m_eventQueueCount = 1; |
@@ -120,7 +121,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
120 | public FetchInventoryDescendentsCAPS CAPSFetchInventoryDescendents = null; | 121 | public FetchInventoryDescendentsCAPS CAPSFetchInventoryDescendents = null; |
121 | public GetClientDelegate GetClient = null; | 122 | public GetClientDelegate GetClient = null; |
122 | 123 | ||
123 | public Caps(IAssetCache assetCache, BaseHttpServer httpServer, string httpListen, uint httpPort, string capsPath, | 124 | public Caps(IAssetCache assetCache, IHttpServer httpServer, string httpListen, uint httpPort, string capsPath, |
124 | UUID agent, bool dumpAssetsToFile, string regionName) | 125 | UUID agent, bool dumpAssetsToFile, string regionName) |
125 | { | 126 | { |
126 | m_assetCache = assetCache; | 127 | m_assetCache = assetCache; |
@@ -808,7 +809,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
808 | private UUID newAssetID; | 809 | private UUID newAssetID; |
809 | private UUID inventoryItemID; | 810 | private UUID inventoryItemID; |
810 | private UUID parentFolder; | 811 | private UUID parentFolder; |
811 | private BaseHttpServer httpListener; | 812 | private IHttpServer httpListener; |
812 | private bool m_dumpAssetsToFile; | 813 | private bool m_dumpAssetsToFile; |
813 | private string m_assetName = String.Empty; | 814 | private string m_assetName = String.Empty; |
814 | private string m_assetDes = String.Empty; | 815 | private string m_assetDes = String.Empty; |
@@ -818,7 +819,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
818 | 819 | ||
819 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, | 820 | public AssetUploader(string assetName, string description, UUID assetID, UUID inventoryItem, |
820 | UUID parentFolderID, string invType, string assetType, string path, | 821 | UUID parentFolderID, string invType, string assetType, string path, |
821 | BaseHttpServer httpServer, bool dumpAssetsToFile) | 822 | IHttpServer httpServer, bool dumpAssetsToFile) |
822 | { | 823 | { |
823 | m_assetName = assetName; | 824 | m_assetName = assetName; |
824 | m_assetDes = description; | 825 | m_assetDes = description; |
@@ -907,10 +908,10 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
907 | 908 | ||
908 | private string uploaderPath = String.Empty; | 909 | private string uploaderPath = String.Empty; |
909 | private UUID inventoryItemID; | 910 | private UUID inventoryItemID; |
910 | private BaseHttpServer httpListener; | 911 | private IHttpServer httpListener; |
911 | private bool m_dumpAssetToFile; | 912 | private bool m_dumpAssetToFile; |
912 | 913 | ||
913 | public ItemUpdater(UUID inventoryItem, string path, BaseHttpServer httpServer, bool dumpAssetToFile) | 914 | public ItemUpdater(UUID inventoryItem, string path, IHttpServer httpServer, bool dumpAssetToFile) |
914 | { | 915 | { |
915 | m_dumpAssetToFile = dumpAssetToFile; | 916 | m_dumpAssetToFile = dumpAssetToFile; |
916 | 917 | ||
@@ -991,11 +992,11 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
991 | private UUID inventoryItemID; | 992 | private UUID inventoryItemID; |
992 | private UUID primID; | 993 | private UUID primID; |
993 | private bool isScriptRunning; | 994 | private bool isScriptRunning; |
994 | private BaseHttpServer httpListener; | 995 | private IHttpServer httpListener; |
995 | private bool m_dumpAssetToFile; | 996 | private bool m_dumpAssetToFile; |
996 | 997 | ||
997 | public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning, | 998 | public TaskInventoryScriptUpdater(UUID inventoryItemID, UUID primID, int isScriptRunning, |
998 | string path, BaseHttpServer httpServer, bool dumpAssetToFile) | 999 | string path, IHttpServer httpServer, bool dumpAssetToFile) |
999 | { | 1000 | { |
1000 | m_dumpAssetToFile = dumpAssetToFile; | 1001 | m_dumpAssetToFile = dumpAssetToFile; |
1001 | 1002 | ||