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/Application | |
parent | * Commit 3/3 - Please test this revision. (diff) | |
download | opensim-SC_OLD-4dc75e4b76e802d06faef5aa14beeced62eadcb5.zip opensim-SC_OLD-4dc75e4b76e802d06faef5aa14beeced62eadcb5.tar.gz opensim-SC_OLD-4dc75e4b76e802d06faef5aa14beeced62eadcb5.tar.bz2 opensim-SC_OLD-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 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 1f67c6a..7924421 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -453,7 +453,7 @@ namespace OpenSim | |||
453 | /// <param name="regionInfo"></param> | 453 | /// <param name="regionInfo"></param> |
454 | /// <param name="portadd_flag"></param> | 454 | /// <param name="portadd_flag"></param> |
455 | /// <returns></returns> | 455 | /// <returns></returns> |
456 | public LLUDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag) | 456 | public IClientNetworkServer CreateRegion(RegionInfo regionInfo, bool portadd_flag) |
457 | { | 457 | { |
458 | return CreateRegion(regionInfo, portadd_flag, false); | 458 | return CreateRegion(regionInfo, portadd_flag, false); |
459 | } | 459 | } |
@@ -464,7 +464,7 @@ namespace OpenSim | |||
464 | /// <param name="regionInfo"></param> | 464 | /// <param name="regionInfo"></param> |
465 | /// <param name="portadd_flag"></param> | 465 | /// <param name="portadd_flag"></param> |
466 | /// <returns></returns> | 466 | /// <returns></returns> |
467 | public LLUDPServer CreateRegion(RegionInfo regionInfo) | 467 | public IClientNetworkServer CreateRegion(RegionInfo regionInfo) |
468 | { | 468 | { |
469 | return CreateRegion(regionInfo, false, true); | 469 | return CreateRegion(regionInfo, false, true); |
470 | } | 470 | } |
@@ -476,7 +476,7 @@ namespace OpenSim | |||
476 | /// <param name="portadd_flag"></param> | 476 | /// <param name="portadd_flag"></param> |
477 | /// <param name="do_post_init"></param> | 477 | /// <param name="do_post_init"></param> |
478 | /// <returns></returns> | 478 | /// <returns></returns> |
479 | public LLUDPServer CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init) | 479 | public IClientNetworkServer CreateRegion(RegionInfo regionInfo, bool portadd_flag, bool do_post_init) |
480 | { | 480 | { |
481 | int port = regionInfo.InternalEndPoint.Port; | 481 | int port = regionInfo.InternalEndPoint.Port; |
482 | 482 | ||
@@ -496,7 +496,7 @@ namespace OpenSim | |||
496 | Util.XmlRpcCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName); | 496 | Util.XmlRpcCommand(proxyUrl, "AddPort", port, port + proxyOffset, regionInfo.ExternalHostName); |
497 | } | 497 | } |
498 | 498 | ||
499 | LLUDPServer udpServer; | 499 | IClientNetworkServer udpServer; |
500 | Scene scene = SetupScene(regionInfo, proxyOffset, out udpServer, m_permissions); | 500 | Scene scene = SetupScene(regionInfo, proxyOffset, out udpServer, m_permissions); |
501 | 501 | ||
502 | m_log.Info("[MODULES]: Loading Region's modules"); | 502 | m_log.Info("[MODULES]: Loading Region's modules"); |
@@ -551,7 +551,7 @@ namespace OpenSim | |||
551 | 551 | ||
552 | m_clientServers.Add(udpServer); | 552 | m_clientServers.Add(udpServer); |
553 | m_regionData.Add(regionInfo); | 553 | m_regionData.Add(regionInfo); |
554 | udpServer.ServerListener(); | 554 | udpServer.Start(); |
555 | 555 | ||
556 | if (do_post_init) | 556 | if (do_post_init) |
557 | { | 557 | { |