diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/ClientStackManager.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/ClientStackManager.cs | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/ClientStackManager.cs b/OpenSim/Region/ClientStack/ClientStackManager.cs index 0b0c07f..2751e0a 100644 --- a/OpenSim/Region/ClientStack/ClientStackManager.cs +++ b/OpenSim/Region/ClientStack/ClientStackManager.cs | |||
@@ -65,11 +65,45 @@ namespace OpenSim.Region.Environment | |||
65 | } | 65 | } |
66 | } | 66 | } |
67 | } | 67 | } |
68 | |||
69 | /// <summary> | ||
70 | /// Create a server that can set up sessions for virtual world client <-> server communications | ||
71 | /// </summary> | ||
72 | /// <param name="_listenIP"></param> | ||
73 | /// <param name="port"></param> | ||
74 | /// <param name="proxyPortOffset"></param> | ||
75 | /// <param name="allow_alternate_port"></param> | ||
76 | /// <param name="assetCache"></param> | ||
77 | /// <param name="authenticateClass"></param> | ||
78 | /// <returns></returns> | ||
79 | public IClientNetworkServer CreateServer( | ||
80 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, | ||
81 | AssetCache assetCache, AgentCircuitManager authenticateClass) | ||
82 | { | ||
83 | return CreateServer( | ||
84 | _listenIP, ref port, proxyPortOffset, allow_alternate_port, null, assetCache, authenticateClass); | ||
85 | } | ||
68 | 86 | ||
87 | /// <summary> | ||
88 | /// Create a server that can set up sessions for virtual world client <-> server communications | ||
89 | /// </summary> | ||
90 | /// <param name="_listenIP"></param> | ||
91 | /// <param name="port"></param> | ||
92 | /// <param name="proxyPortOffset"></param> | ||
93 | /// <param name="allow_alternate_port"></param> | ||
94 | /// <param name="settings"> | ||
95 | /// Can be null, in which case default values are used | ||
96 | /// </param> | ||
97 | /// <param name="assetCache"></param> | ||
98 | /// <param name="authenticateClass"></param> | ||
99 | /// <returns></returns> | ||
69 | public IClientNetworkServer CreateServer( | 100 | public IClientNetworkServer CreateServer( |
70 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, ClientStackUserSettings settings, | 101 | IPAddress _listenIP, ref uint port, int proxyPortOffset, bool allow_alternate_port, ClientStackUserSettings settings, |
71 | AssetCache assetCache, AgentCircuitManager authenticateClass) | 102 | AssetCache assetCache, AgentCircuitManager authenticateClass) |
72 | { | 103 | { |
104 | if (null == settings) | ||
105 | settings = new ClientStackUserSettings(); | ||
106 | |||
73 | if (plugin != null) | 107 | if (plugin != null) |
74 | { | 108 | { |
75 | IClientNetworkServer server = | 109 | IClientNetworkServer server = |