aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs3
3 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs
index f44ba30..bdb90d8 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGScene.Inventory.cs
@@ -58,10 +58,10 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
58 58
59 public HGScene(RegionInfo regInfo, AgentCircuitManager authen, 59 public HGScene(RegionInfo regInfo, AgentCircuitManager authen,
60 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 60 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
61 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 61 AssetCache assetCach, StorageManager storeManager,
62 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 62 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
63 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 63 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
64 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, httpServer, moduleLoader, 64 : base(regInfo, authen, commsMan, sceneGridService, assetCach, storeManager, moduleLoader,
65 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion) 65 dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
66 { 66 {
67 m_log.Info("[HGScene]: Starting HGScene."); 67 m_log.Info("[HGScene]: Starting HGScene.");
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 480b750..18afb86 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -120,8 +120,6 @@ namespace OpenSim.Region.Environment.Scenes
120 /// </summary> 120 /// </summary>
121 protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>(); 121 protected Dictionary<UUID, Caps> m_capsHandlers = new Dictionary<UUID, Caps>();
122 122
123 protected BaseHttpServer m_httpListener;
124
125 /// <value> 123 /// <value>
126 /// All the region modules attached to this scene. 124 /// All the region modules attached to this scene.
127 /// </value> 125 /// </value>
@@ -300,7 +298,7 @@ namespace OpenSim.Region.Environment.Scenes
300 298
301 public Scene(RegionInfo regInfo, AgentCircuitManager authen, 299 public Scene(RegionInfo regInfo, AgentCircuitManager authen,
302 CommunicationsManager commsMan, SceneCommunicationService sceneGridService, 300 CommunicationsManager commsMan, SceneCommunicationService sceneGridService,
303 AssetCache assetCach, StorageManager storeManager, BaseHttpServer httpServer, 301 AssetCache assetCach, StorageManager storeManager,
304 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim, 302 ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
305 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) 303 bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
306 { 304 {
@@ -351,7 +349,6 @@ namespace OpenSim.Region.Environment.Scenes
351 349
352 RegisterDefaultSceneEvents(); 350 RegisterDefaultSceneEvents();
353 351
354 m_httpListener = httpServer;
355 m_dumpAssetsToFile = dumpAssetsToFile; 352 m_dumpAssetsToFile = dumpAssetsToFile;
356 353
357 m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts; 354 m_scripts_enabled = !RegionInfo.RegionSettings.DisableScripts;
@@ -2874,8 +2871,11 @@ namespace OpenSim.Region.Environment.Scenes
2874 return; 2871 return;
2875 } 2872 }
2876 2873
2877 cap = new Caps(AssetCache, m_httpListener, m_regInfo.ExternalHostName, m_httpListener.Port, 2874 cap
2878 capsObjectPath, agentId, m_dumpAssetsToFile, RegionInfo.RegionName); 2875 = new Caps(
2876 AssetCache, CommsManager.HttpServer, m_regInfo.ExternalHostName, CommsManager.HttpServer.Port,
2877 capsObjectPath, agentId, m_dumpAssetsToFile, RegionInfo.RegionName);
2878
2879 cap.RegisterHandlers(); 2879 cap.RegisterHandlers();
2880 2880
2881 EventManager.TriggerOnRegisterCaps(agentId, cap); 2881 EventManager.TriggerOnRegisterCaps(agentId, cap);
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
index 5212f94..13ccce2 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs
@@ -60,11 +60,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
60 AssetCache ac = new AssetCache(assetService); 60 AssetCache ac = new AssetCache(assetService);
61 61
62 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); 62 StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", "");
63 BaseHttpServer httpServer = new BaseHttpServer(666);
64 IConfigSource configSource = new IniConfigSource(); 63 IConfigSource configSource = new IniConfigSource();
65 64
66 TestScene testScene = new TestScene( 65 TestScene testScene = new TestScene(
67 regInfo, acm, cm, scs, ac, sm, httpServer, null, false, false, false, configSource, null); 66 regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null);
68 67
69 testScene.LandChannel = new TestLandChannel(); 68 testScene.LandChannel = new TestLandChannel();
70 testScene.LoadWorldMap(); 69 testScene.LoadWorldMap();