diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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); |