aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/CommunicationsManager.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-19 18:11:44 +0000
committerJustin Clarke Casey2009-03-19 18:11:44 +0000
commitbd2180d9af21dd54d4199a9381afa3e43e913823 (patch)
tree7f82f0dd30e24d8eaa4f8cbb2493cb2f3f1c637f /OpenSim/Framework/Communications/CommunicationsManager.cs
parent* Lock http handlers dictionary in other places as well to avoid race conditions (diff)
downloadopensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.zip
opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.gz
opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.bz2
opensim-SC-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.xz
* refactor: Create IHttpServer interface instead of accessing BaseHttpServer via CommunicationsManager directly
Diffstat (limited to 'OpenSim/Framework/Communications/CommunicationsManager.cs')
-rw-r--r--OpenSim/Framework/Communications/CommunicationsManager.cs12
1 files changed, 7 insertions, 5 deletions
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;