diff options
Heart surgery on asset service code bits. Affects OpenSim.ini configuration -- please see the example. Affects region servers only.
This may break a lot of things, but it needs to go in. It was tested in standalone and the UCI grid, but it needs a lot more testing.
Known problems:
* HG asset transfers are borked for now
* missing texture is missing
* 3 unit tests commented out for now
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index e796cff..4eaaea1 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
132 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, | 132 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, |
133 | IAssetCache assetCache, AgentCircuitManager authenticateClass) | 133 | IAssetCache assetCache, AgentCircuitManager authenticateClass) |
134 | { | 134 | { |
135 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, assetCache, authenticateClass); | 135 | Initialise(_listenIP, ref port, proxyPortOffset, allow_alternate_port, configSource, authenticateClass); |
136 | } | 136 | } |
137 | 137 | ||
138 | /// <summary> | 138 | /// <summary> |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
147 | /// <param name="circuitManager"></param> | 147 | /// <param name="circuitManager"></param> |
148 | public void Initialise( | 148 | public void Initialise( |
149 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, | 149 | IPAddress _listenIP, ref uint port, int proxyPortOffsetParm, bool allow_alternate_port, IConfigSource configSource, |
150 | IAssetCache assetCache, AgentCircuitManager circuitManager) | 150 | AgentCircuitManager circuitManager) |
151 | { | 151 | { |
152 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); | 152 | ClientStackUserSettings userSettings = new ClientStackUserSettings(); |
153 | 153 | ||
@@ -165,7 +165,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
165 | listenPort = (uint) (port + proxyPortOffsetParm); | 165 | listenPort = (uint) (port + proxyPortOffsetParm); |
166 | listenIP = _listenIP; | 166 | listenIP = _listenIP; |
167 | Allow_Alternate_Port = allow_alternate_port; | 167 | Allow_Alternate_Port = allow_alternate_port; |
168 | m_assetCache = assetCache; | ||
169 | m_circuitManager = circuitManager; | 168 | m_circuitManager = circuitManager; |
170 | CreatePacketServer(userSettings); | 169 | CreatePacketServer(userSettings); |
171 | 170 | ||