diff options
author | Adam Frisby | 2008-05-02 18:18:43 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-02 18:18:43 +0000 |
commit | 4dc75e4b76e802d06faef5aa14beeced62eadcb5 (patch) | |
tree | bb2cce5efd3bc8dd5dc04e6ff6a6519e7a9e5a23 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | * Commit 3/3 - Please test this revision. (diff) | |
download | opensim-SC-4dc75e4b76e802d06faef5aa14beeced62eadcb5.zip opensim-SC-4dc75e4b76e802d06faef5aa14beeced62eadcb5.tar.gz opensim-SC-4dc75e4b76e802d06faef5aa14beeced62eadcb5.tar.bz2 opensim-SC-4dc75e4b76e802d06faef5aa14beeced62eadcb5.tar.xz |
* More clientstack abstractions - We now only have a single constructor call to UDPServer. Going to reduce this with an abstracted constructor in a bit.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 1102fb4..3fa2371 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs | |||
@@ -107,12 +107,12 @@ namespace OpenSim.Region.ClientStack | |||
107 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine); | 107 | return physicsPluginManager.GetPhysicsScene(engine, meshEngine); |
108 | } | 108 | } |
109 | 109 | ||
110 | protected Scene SetupScene(RegionInfo regionInfo, out LLUDPServer udpServer, bool m_permissions) | 110 | protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer udpServer, bool m_permissions) |
111 | { | 111 | { |
112 | return SetupScene(regionInfo, 0, out udpServer, m_permissions); | 112 | return SetupScene(regionInfo, 0, out udpServer, m_permissions); |
113 | } | 113 | } |
114 | 114 | ||
115 | protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out LLUDPServer udpServer, bool m_permissions) | 115 | protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out IClientNetworkServer udpServer, bool m_permissions) |
116 | { | 116 | { |
117 | AgentCircuitManager circuitManager = new AgentCircuitManager(); | 117 | AgentCircuitManager circuitManager = new AgentCircuitManager(); |
118 | IPAddress listenIP = regionInfo.InternalEndPoint.Address; | 118 | IPAddress listenIP = regionInfo.InternalEndPoint.Address; |
@@ -124,8 +124,8 @@ namespace OpenSim.Region.ClientStack | |||
124 | regionInfo.InternalEndPoint.Port = (int)port; | 124 | regionInfo.InternalEndPoint.Port = (int)port; |
125 | 125 | ||
126 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); | 126 | Scene scene = CreateScene(regionInfo, m_storageManager, circuitManager); |
127 | 127 | ||
128 | udpServer.LocalScene = scene; | 128 | udpServer.AddScene(scene); |
129 | 129 | ||
130 | scene.LoadWorldMap(); | 130 | scene.LoadWorldMap(); |
131 | 131 | ||