aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authormeta72010-08-22 09:32:49 -0700
committermeta72010-08-22 09:32:49 -0700
commit8a1640f0a1838a0cfc05ec6bab6d5d6166fde221 (patch)
tree94c0d096eb9889f425269a926ef2090590f75ae7 /OpenSim/Region/Framework/Scenes/Scene.cs
parentFix llGetLinkKey and llGetNumberOfPrims to play nice with avatars in the link... (diff)
parentRefix the fix (diff)
downloadopensim-SC_OLD-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.zip
opensim-SC_OLD-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.tar.gz
opensim-SC_OLD-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.tar.bz2
opensim-SC_OLD-8a1640f0a1838a0cfc05ec6bab6d5d6166fde221.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 32211c4..957c4e8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -658,6 +658,7 @@ namespace OpenSim.Region.Framework.Scenes
658 m_persistAfter *= 10000000; 658 m_persistAfter *= 10000000;
659 659
660 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine"); 660 m_defaultScriptEngine = startupConfig.GetString("DefaultScriptEngine", "XEngine");
661 m_log.InfoFormat("[SCENE]: Default script engine {0}", m_defaultScriptEngine);
661 662
662 IConfig packetConfig = m_config.Configs["PacketPool"]; 663 IConfig packetConfig = m_config.Configs["PacketPool"];
663 if (packetConfig != null) 664 if (packetConfig != null)
@@ -692,9 +693,9 @@ namespace OpenSim.Region.Framework.Scenes
692 } 693 }
693 } 694 }
694 } 695 }
695 catch 696 catch (Exception e)
696 { 697 {
697 m_log.Warn("[SCENE]: Failed to load StartupConfig"); 698 m_log.Error("[SCENE]: Failed to load StartupConfig: " + e.ToString());
698 } 699 }
699 700
700 #endregion Region Config 701 #endregion Region Config