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 '')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientStackManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs index a7b65cb..4f36df8 100644 --- a/OpenSim/Region/ClientStack/ClientStackManager.cs +++ b/OpenSim/Region/ClientStack/ClientStackManager.cs | |||
@@ -86,10 +86,10 @@ namespace OpenSim.Region.ClientStack | |||
86 | /// <returns></returns> | 86 | /// <returns></returns> |
87 | public IClientNetworkServer CreateServer( | 87 | public IClientNetworkServer CreateServer( |
88 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, | 88 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, |
89 | IAssetCache assetCache, AgentCircuitManager authenticateClass) | 89 | AgentCircuitManager authenticateClass) |
90 | { | 90 | { |
91 | return CreateServer( | 91 | return CreateServer( |
92 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, assetCache, authenticateClass); | 92 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass); |
93 | } | 93 | } |
94 | 94 | ||
95 | /// <summary> | 95 | /// <summary> |
@@ -107,7 +107,7 @@ namespace OpenSim.Region.ClientStack | |||
107 | /// <returns></returns> | 107 | /// <returns></returns> |
108 | public IClientNetworkServer CreateServer( | 108 | public IClientNetworkServer CreateServer( |
109 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, | 109 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, IConfigSource configSource, |
110 | IAssetCache assetCache, AgentCircuitManager authenticateClass) | 110 | AgentCircuitManager authenticateClass) |
111 | { | 111 | { |
112 | if (plugin != null) | 112 | if (plugin != null) |
113 | { | 113 | { |
@@ -116,7 +116,7 @@ namespace OpenSim.Region.ClientStack | |||
116 | 116 | ||
117 | server.Initialise( | 117 | server.Initialise( |
118 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, | 118 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, |
119 | configSource, assetCache, authenticateClass); | 119 | configSource, authenticateClass); |
120 | 120 | ||
121 | return server; | 121 | return server; |
122 | } | 122 | } |