aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorMelanie2010-09-03 03:37:18 +0100
committerMelanie2010-09-03 03:37:18 +0100
commit4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00 (patch)
tree6ecae46c7c5d46d4eb5a5ed65c1a7a8b8b15cc04 /OpenSim/Region/Application/OpenSimBase.cs
parentFix an issue with rezzing scripted objects. (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.zip
opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.gz
opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.bz2
opensim-SC_OLD-4e0d6e8e41cf25a8e8d8524d9d5e94ab0752fb00.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-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 4ef0b1b..ec3193c 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;
@@ -403,7 +402,9 @@ namespace OpenSim
403 } 402 }
404 catch (Exception e) 403 catch (Exception e)
405 { 404 {
406 m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); 405 m_log.ErrorFormat(
406 "[STARTUP]: Registration of region with grid failed, aborting startup due to {0} {1}",
407 e.Message, e.StackTrace);
407 408
408 if (scene.SnmpService != null) 409 if (scene.SnmpService != null)
409 { 410 {