aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Region/ScriptEngine/Shared/Api
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* 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)
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs4
1 files changed, 3 insertions, 1 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