aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorDiva Canto2010-09-02 16:36:43 -0700
committerDiva Canto2010-09-02 16:36:43 -0700
commit21c5377af998bdd2c6a442588195a7af4d21fa48 (patch)
tree149e6d3dbeb5b3061bd5625763dfb388a50ed47b /OpenSim/Region/Application/OpenSimBase.cs
parentQuick fix for making global references for gatekeepers that are not domain:po... (diff)
parentRemove commented code and the comment, as the change has proven out (diff)
downloadopensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.zip
opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.tar.gz
opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.tar.bz2
opensim-SC_OLD-21c5377af998bdd2c6a442588195a7af4d21fa48.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index b80d17d..d2d2607 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -36,7 +36,6 @@ using Nini.Config;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39
40using OpenSim.Framework.Console; 39using OpenSim.Framework.Console;
41using OpenSim.Framework.Servers; 40using OpenSim.Framework.Servers;
42using OpenSim.Framework.Servers.HttpServer; 41using OpenSim.Framework.Servers.HttpServer;
@@ -356,7 +355,9 @@ namespace OpenSim
356 } 355 }
357 catch (Exception e) 356 catch (Exception e)
358 { 357 {
359 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); 358 m_log.ErrorFormat(
359 "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
360 e.Message, e.StackTrace);
360 361
361 // Carrying on now causes a lot of confusion down the 362 // Carrying on now causes a lot of confusion down the
362 // line - we need to get the user's attention 363 // line - we need to get the user's attention