aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 4006066..b671fc5 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -122,14 +122,16 @@ namespace OpenSim.Region.ClientStack
122 /// <summary> 122 /// <summary>
123 /// Create a scene and its initial base structures. 123 /// Create a scene and its initial base structures.
124 /// </summary> 124 /// </summary>
125 /// TODO: Really configSource shouldn't be passed in here, but should be moved up to BaseOpenSimServer and
126 /// made common to all the servers.
127 ///
125 /// <param name="regionInfo"></param> 128 /// <param name="regionInfo"></param>
126 /// <param name="proxyOffset"></param> 129 /// <param name="proxyOffset"></param>
127 /// <param name="clientStackUserSettings"></param> 130 /// <param name="configSource"></param>
128 /// <param name="clientServer"> </param> 131 /// <param name="clientServer"> </param>
129 /// <returns></returns> 132 /// <returns></returns>
130 protected Scene SetupScene( 133 protected Scene SetupScene(
131 RegionInfo regionInfo, int proxyOffset, ClientStackUserSettings clientStackUserSettings, 134 RegionInfo regionInfo, int proxyOffset, IConfigSource configSource, out IClientNetworkServer clientServer)
132 out IClientNetworkServer clientServer)
133 { 135 {
134 AgentCircuitManager circuitManager = new AgentCircuitManager(); 136 AgentCircuitManager circuitManager = new AgentCircuitManager();
135 IPAddress listenIP = regionInfo.InternalEndPoint.Address; 137 IPAddress listenIP = regionInfo.InternalEndPoint.Address;
@@ -140,7 +142,7 @@ namespace OpenSim.Region.ClientStack
140 142
141 clientServer 143 clientServer
142 = m_clientStackManager.CreateServer( 144 = m_clientStackManager.CreateServer(
143 listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, clientStackUserSettings, 145 listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, configSource,
144 m_assetCache, circuitManager); 146 m_assetCache, circuitManager);
145 147
146 regionInfo.InternalEndPoint.Port = (int)port; 148 regionInfo.InternalEndPoint.Port = (int)port;