From acad0328b2c50d22fe76ebb7c8de2c97c856b42f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 11 Mar 2009 18:02:22 +0000
Subject: * Make all coded defaults match settings in OpenSim.ini.example * In
 most cases, the setting in OpenSim.ini.example is taken as the canonical one
 since this is the file virtually everyone ends up using * OpenSim will start
 up with a blank OpenSim.ini, in which case sqlite is the default database (as
 before)

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 +++-
 OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs         | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 69d9c38..1ede395 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -8717,7 +8717,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             IConfigSource config = new IniConfigSource(Application.iniFilePath);
             if (config.Configs["Network"] != null)
             {
-                shard = config.Configs["Network"].GetString("user_server_url", shard);
+                shard 
+                    = config.Configs["Network"].GetString(
+                        "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
                 shard = config.Configs["Network"].GetString("shard", shard);
             }
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 041e751..6c8f3d0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         public void ReadConfig()
         {
             // Get some config
-            WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true);
+            WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false);
             CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true);
 
             // Get file prefix from scriptengine name and make it file system safe:
@@ -187,7 +187,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         /// </summary>
         private void DeleteOldFiles()
         {
-
             // CREATE FOLDER IF IT DOESNT EXIST
             if (!Directory.Exists(ScriptEnginesPath))
             {
-- 
cgit v1.1