diff options
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 3 |
2 files changed, 4 insertions, 3 deletions
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 | |||
8717 | IConfigSource config = new IniConfigSource(Application.iniFilePath); | 8717 | IConfigSource config = new IniConfigSource(Application.iniFilePath); |
8718 | if (config.Configs["Network"] != null) | 8718 | if (config.Configs["Network"] != null) |
8719 | { | 8719 | { |
8720 | shard = config.Configs["Network"].GetString("user_server_url", shard); | 8720 | shard |
8721 | = config.Configs["Network"].GetString( | ||
8722 | "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()); | ||
8721 | shard = config.Configs["Network"].GetString("shard", shard); | 8723 | shard = config.Configs["Network"].GetString("shard", shard); |
8722 | } | 8724 | } |
8723 | 8725 | ||
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 | |||
100 | public void ReadConfig() | 100 | public void ReadConfig() |
101 | { | 101 | { |
102 | // Get some config | 102 | // Get some config |
103 | WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", true); | 103 | WriteScriptSourceToDebugFile = m_scriptEngine.Config.GetBoolean("WriteScriptSourceToDebugFile", false); |
104 | CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true); | 104 | CompileWithDebugInformation = m_scriptEngine.Config.GetBoolean("CompileWithDebugInformation", true); |
105 | 105 | ||
106 | // Get file prefix from scriptengine name and make it file system safe: | 106 | // Get file prefix from scriptengine name and make it file system safe: |
@@ -187,7 +187,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
187 | /// </summary> | 187 | /// </summary> |
188 | private void DeleteOldFiles() | 188 | private void DeleteOldFiles() |
189 | { | 189 | { |
190 | |||
191 | // CREATE FOLDER IF IT DOESNT EXIST | 190 | // CREATE FOLDER IF IT DOESNT EXIST |
192 | if (!Directory.Exists(ScriptEnginesPath)) | 191 | if (!Directory.Exists(ScriptEnginesPath)) |
193 | { | 192 | { |