aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-12 00:38:57 +0000
committerTeravus Ovares2007-12-12 00:38:57 +0000
commit9abe4b2ebf537d32b0b01d404497f290a4f4f806 (patch)
tree63c12f570f5e82ccc54b99a805c41ce84abeba65 /OpenSim/Region/Application
parentput in a try block to catch the ForEach loop dying. (diff)
downloadopensim-SC_OLD-9abe4b2ebf537d32b0b01d404497f290a4f4f806.zip
opensim-SC_OLD-9abe4b2ebf537d32b0b01d404497f290a4f4f806.tar.gz
opensim-SC_OLD-9abe4b2ebf537d32b0b01d404497f290a4f4f806.tar.bz2
opensim-SC_OLD-9abe4b2ebf537d32b0b01d404497f290a4f4f806.tar.xz
* Start listening for client connections immediately after a region initializes during initial instance startup. (as opposed to waiting for 'all of the regions' to initialize first)
* Removed hackish timer based client notification about regions up (no longer needed) * Added a comment about an inventory based login failure that causes me lots of greif testing and debugging. Comment includes *why* it's failing.
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 88a7bc2..1471f89 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -338,10 +338,10 @@ namespace OpenSim
338 } 338 }
339 339
340 // Start UDP servers 340 // Start UDP servers
341 for (int i = 0; i < m_udpServers.Count; i++) 341 //for (int i = 0; i < m_udpServers.Count; i++)
342 { 342 //{
343 m_udpServers[i].ServerListener(); 343 // m_udpServers[i].ServerListener();
344 } 344 // }
345 345
346 //Run Startup Commands 346 //Run Startup Commands
347 if (m_startupCommandsFile != "") 347 if (m_startupCommandsFile != "")
@@ -385,6 +385,7 @@ namespace OpenSim
385 385
386 m_udpServers.Add(udpServer); 386 m_udpServers.Add(udpServer);
387 m_regionData.Add(regionInfo); 387 m_regionData.Add(regionInfo);
388 udpServer.ServerListener();
388 389
389 return udpServer; 390 return udpServer;
390 } 391 }
@@ -484,7 +485,7 @@ namespace OpenSim
484 m_regionData.RemoveAt(RegionHandleElement); 485 m_regionData.RemoveAt(RegionHandleElement);
485 } 486 }
486 UDPServer restartingRegion = CreateRegion(whichRegion); 487 UDPServer restartingRegion = CreateRegion(whichRegion);
487 restartingRegion.ServerListener(); 488 //restartingRegion.ServerListener();
488 //m_sceneManager.SendSimOnlineNotification(restartingRegion.RegionHandle); 489 //m_sceneManager.SendSimOnlineNotification(restartingRegion.RegionHandle);
489 } 490 }
490 491
@@ -757,7 +758,7 @@ namespace OpenSim
757 break; 758 break;
758 759
759 case "create-region": 760 case "create-region":
760 CreateRegion(new RegionInfo(cmdparams[0], "Regions/" + cmdparams[1])).ServerListener(); 761 CreateRegion(new RegionInfo(cmdparams[0], "Regions/" + cmdparams[1]));
761 break; 762 break;
762 763
763 case "remove-region": 764 case "remove-region":