aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs17
-rw-r--r--OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs5
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs12
3 files changed, 19 insertions, 15 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;
33using log4net; 33using log4net;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
36using 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
diff --git a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
index ed31c45..b47d014 100644
--- a/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
+++ b/OpenSim/Framework/Communications/Capabilities/CapsHandlers.cs
@@ -28,6 +28,7 @@
28using System.Collections; 28using System.Collections;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenSim.Framework.Servers; 30using OpenSim.Framework.Servers;
31using OpenSim.Framework.Servers.Interfaces;
31 32
32namespace OpenSim.Framework.Communications.Capabilities 33namespace OpenSim.Framework.Communications.Capabilities
33{ 34{
@@ -39,7 +40,7 @@ namespace OpenSim.Framework.Communications.Capabilities
39 public class CapsHandlers 40 public class CapsHandlers
40 { 41 {
41 private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>(); 42 private Dictionary <string, IRequestHandler> m_capsHandlers = new Dictionary<string, IRequestHandler>();
42 private BaseHttpServer m_httpListener; 43 private IHttpServer m_httpListener;
43 private string m_httpListenerHostName; 44 private string m_httpListenerHostName;
44 private uint m_httpListenerPort; 45 private uint m_httpListenerPort;
45 private bool m_useSSL = false; 46 private bool m_useSSL = false;
@@ -67,7 +68,7 @@ namespace OpenSim.Framework.Communications.Capabilities
67 /// <param name="httpListenerHostname">host name of the HTTP 68 /// <param name="httpListenerHostname">host name of the HTTP
68 /// server</param> 69 /// server</param>
69 /// <param name="httpListenerPort">HTTP port</param> 70 /// <param name="httpListenerPort">HTTP port</param>
70 public CapsHandlers(BaseHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https) 71 public CapsHandlers(IHttpServer httpListener, string httpListenerHostname, uint httpListenerPort, bool https)
71 { 72 {
72 m_httpListener = httpListener; 73 m_httpListener = httpListener;
73 m_httpListenerHostName = httpListenerHostname; 74 m_httpListenerHostName = httpListenerHostname;
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs
index 3363c24..b4078fd 100644
--- a/OpenSim/Framework/Communications/CommunicationsManager.cs
+++ b/OpenSim/Framework/Communications/CommunicationsManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using OpenMetaverse; 30using OpenMetaverse;
31using OpenSim.Framework.Communications.Cache; 31using OpenSim.Framework.Communications.Cache;
32using OpenSim.Framework.Servers; 32using OpenSim.Framework.Servers.Interfaces;
33 33
34namespace OpenSim.Framework.Communications 34namespace OpenSim.Framework.Communications
35{ 35{
@@ -106,12 +106,14 @@ namespace OpenSim.Framework.Communications
106 } 106 }
107 protected IUserAdminService m_userAdminService; 107 protected IUserAdminService m_userAdminService;
108 108
109 public BaseHttpServer HttpServer 109 /// <value>
110 /// OpenSimulator's built in HTTP server
111 /// </value>
112 public IHttpServer HttpServer
110 { 113 {
111 get { return m_httpServer; } 114 get { return m_httpServer; }
112 } 115 }
113 protected BaseHttpServer m_httpServer; 116 protected IHttpServer m_httpServer;
114
115 117
116 /// <summary> 118 /// <summary>
117 /// Constructor 119 /// Constructor
@@ -120,7 +122,7 @@ namespace OpenSim.Framework.Communications
120 /// <param name="httpServer"></param> 122 /// <param name="httpServer"></param>
121 /// <param name="assetCache"></param> 123 /// <param name="assetCache"></param>
122 /// <param name="dumpAssetsToFile"></param> 124 /// <param name="dumpAssetsToFile"></param>
123 public CommunicationsManager(NetworkServersInfo serversInfo, BaseHttpServer httpServer, IAssetCache assetCache, 125 public CommunicationsManager(NetworkServersInfo serversInfo, IHttpServer httpServer, IAssetCache assetCache,
124 bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder) 126 bool dumpAssetsToFile, LibraryRootFolder libraryRootFolder)
125 { 127 {
126 m_networkServersInfo = serversInfo; 128 m_networkServersInfo = serversInfo;