diff options
author | Adam Frisby | 2008-05-02 18:26:19 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-02 18:26:19 +0000 |
commit | 67bbfadc06f36b5175cd5f7268ba876769667dca (patch) | |
tree | bd4f485b5f72ef7a702af067d8656745f0dc3986 /OpenSim/Region/ClientStack/RegionApplicationBase.cs | |
parent | adding a few more prep parts for this object (diff) | |
download | opensim-SC-67bbfadc06f36b5175cd5f7268ba876769667dca.zip opensim-SC-67bbfadc06f36b5175cd5f7268ba876769667dca.tar.gz opensim-SC-67bbfadc06f36b5175cd5f7268ba876769667dca.tar.bz2 opensim-SC-67bbfadc06f36b5175cd5f7268ba876769667dca.tar.xz |
* More refactorings of UDPServer.
* Removed all references where possible.
* Renamed lots of variables from UDPServerXYZ to clientServerXYZ
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/RegionApplicationBase.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 3fa2371..ba0b9b4 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 IClientNetworkServer udpServer, bool m_permissions) | 110 | protected Scene SetupScene(RegionInfo regionInfo, out IClientNetworkServer clientServer, bool m_permissions) |
111 | { | 111 | { |
112 | return SetupScene(regionInfo, 0, out udpServer, m_permissions); | 112 | return SetupScene(regionInfo, 0, out clientServer, m_permissions); |
113 | } | 113 | } |
114 | 114 | ||
115 | protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out IClientNetworkServer udpServer, bool m_permissions) | 115 | protected Scene SetupScene(RegionInfo regionInfo, int proxyOffset, out IClientNetworkServer clientServer, 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; |
@@ -120,12 +120,12 @@ namespace OpenSim.Region.ClientStack | |||
120 | // listenIP = IPAddress.Parse("0.0.0.0"); | 120 | // listenIP = IPAddress.Parse("0.0.0.0"); |
121 | 121 | ||
122 | uint port = (uint) regionInfo.InternalEndPoint.Port; | 122 | uint port = (uint) regionInfo.InternalEndPoint.Port; |
123 | udpServer = new LLUDPServer(listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, m_assetCache, circuitManager); | 123 | clientServer = new LLUDPServer(listenIP, ref port, proxyOffset, regionInfo.m_allow_alternate_ports, m_assetCache, circuitManager); |
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.AddScene(scene); | 128 | clientServer.AddScene(scene); |
129 | 129 | ||
130 | scene.LoadWorldMap(); | 130 | scene.LoadWorldMap(); |
131 | 131 | ||