aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 08:10:40 +0000
committerTeravus Ovares2008-09-06 08:10:40 +0000
commitf342bd1e96406b7e67c098d89344134c3631631a (patch)
treed01dc70570b2d1cb4603c5e9063b88cc4d484ece
parent* This is the fabled LibOMV update with all of the libOMV types from JHurliman (diff)
downloadopensim-SC_OLD-f342bd1e96406b7e67c098d89344134c3631631a.zip
opensim-SC_OLD-f342bd1e96406b7e67c098d89344134c3631631a.tar.gz
opensim-SC_OLD-f342bd1e96406b7e67c098d89344134c3631631a.tar.bz2
opensim-SC_OLD-f342bd1e96406b7e67c098d89344134c3631631a.tar.xz
* Replace a Try/catch I commented out while testing/fixing issues.
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 86db865..99584da 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -532,18 +532,18 @@ namespace OpenSim
532 // and has to happen before the region is registered with the grid. 532 // and has to happen before the region is registered with the grid.
533 scene.CreateTerrainTexture(false); 533 scene.CreateTerrainTexture(false);
534 534
535 //try 535 try
536 //{ 536 {
537 scene.RegisterRegionWithGrid(); 537 scene.RegisterRegionWithGrid();
538 //} 538 }
539 //catch (Exception e) 539 catch (Exception e)
540 //{ 540 {
541 // m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e); 541 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e);
542 542
543 // Carrying on now causes a lot of confusion down the 543 // Carrying on now causes a lot of confusion down the
544 // line - we need to get the user's attention 544 // line - we need to get the user's attention
545 // System.Environment.Exit(1); 545 System.Environment.Exit(1);
546 //} 546 }
547 547
548 // We need to do this after we've initialized the 548 // We need to do this after we've initialized the
549 // scripting engines. 549 // scripting engines.