aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Hypergrid
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/Region/CoreModules/Hypergrid
parent* Lock http handlers dictionary in other places as well to avoid race conditions (diff)
downloadopensim-SC_OLD-bd2180d9af21dd54d4199a9381afa3e43e913823.zip
opensim-SC_OLD-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.gz
opensim-SC_OLD-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.bz2
opensim-SC_OLD-bd2180d9af21dd54d4199a9381afa3e43e913823.tar.xz
* refactor: Create IHttpServer interface instead of accessing BaseHttpServer via CommunicationsManager directly
Diffstat (limited to 'OpenSim/Region/CoreModules/Hypergrid')
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs3
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs3
2 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
index f8c7c79..4baefc4 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneAssetService.cs
@@ -35,6 +35,7 @@ using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.Interfaces;
38using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
40 41
@@ -116,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
116 IAssetDataPlugin m_assetProvider 117 IAssetDataPlugin m_assetProvider
117 = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; 118 = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin;
118 119
119 BaseHttpServer httpServer = m_scene.CommsManager.HttpServer; 120 IHttpServer httpServer = m_scene.CommsManager.HttpServer;
120 httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider)); 121 httpServer.AddStreamHandler(new GetAssetStreamHandler(m_assetProvider));
121 httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider)); 122 httpServer.AddStreamHandler(new PostAssetStreamHandler(m_assetProvider));
122 123
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
index 6ad032e..cff3611 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneInventoryService.cs
@@ -35,6 +35,7 @@ using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Servers; 37using OpenSim.Framework.Servers;
38using OpenSim.Framework.Servers.Interfaces;
38using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 40using OpenSim.Region.Framework.Scenes;
40 41
@@ -114,7 +115,7 @@ namespace OpenSim.Region.CoreModules.Hypergrid
114 115
115 protected void AddHttpHandlers(Scene m_scene) 116 protected void AddHttpHandlers(Scene m_scene)
116 { 117 {
117 BaseHttpServer httpServer = m_scene.CommsManager.HttpServer; 118 IHttpServer httpServer = m_scene.CommsManager.HttpServer;
118 119
119 httpServer.AddStreamHandler( 120 httpServer.AddStreamHandler(
120 new RestDeserialiseSecureHandler<Guid, InventoryCollection>( 121 new RestDeserialiseSecureHandler<Guid, InventoryCollection>(