diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/ClientStack/ClientStackManager.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientStackManager.cs')
| -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 5667d64..84ea0b3 100644 --- a/OpenSim/Region/ClientStack/ClientStackManager.cs +++ b/OpenSim/Region/ClientStack/ClientStackManager.cs | |||
| @@ -87,9 +87,9 @@ namespace OpenSim.Region.ClientStack | |||
| 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 | AgentCircuitManager authenticateClass) | 89 | AgentCircuitManager authenticateClass) |
| 90 | { | 90 | { |
| 91 | return CreateServer( | 91 | return CreateServer( |
| 92 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass); | 92 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, authenticateClass); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | /// <summary> | 95 | /// <summary> |
| @@ -104,11 +104,11 @@ namespace OpenSim.Region.ClientStack | |||
| 104 | /// </param> | 104 | /// </param> |
| 105 | /// <param name="assetCache"></param> | 105 | /// <param name="assetCache"></param> |
| 106 | /// <param name="authenticateClass"></param> | 106 | /// <param name="authenticateClass"></param> |
| 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 | AgentCircuitManager authenticateClass) | 110 | AgentCircuitManager authenticateClass) |
| 111 | { | 111 | { |
| 112 | if (plugin != null) | 112 | if (plugin != null) |
| 113 | { | 113 | { |
| 114 | IClientNetworkServer server = | 114 | IClientNetworkServer server = |