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/Application/ConfigurationLoader.cs | 19 ++++++++++++-------
.../Currency/SampleMoney/SampleMoneyModule.cs | 2 +-
.../Communications/Local/LocalInterregionComms.cs | 2 +-
.../Scripting/WorldComm/WorldCommModule.cs | 4 ++--
.../World/Permissions/PermissionsModule.cs | 2 +-
.../CoreModules/World/WorldMap/MapImageModule.cs | 2 +-
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs | 22 ++++++++++++++++------
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 8 ++++----
.../ScriptEngine/DotNetEngine/EventQueueManager.cs | 4 +++-
.../ScriptEngine/DotNetEngine/ScriptEngine.cs | 2 +-
.../Shared/Api/Implementation/LSL_Api.cs | 4 +++-
.../ScriptEngine/Shared/CodeTools/Compiler.cs | 3 +--
12 files changed, 46 insertions(+), 28 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 7c335a7..8aa8dde 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -231,14 +231,14 @@ namespace OpenSim
if (null == config)
config = defaultConfig.AddConfig("StandAlone");
- config.Set("accounts_authenticate", false);
+ config.Set("accounts_authenticate", true);
config.Set("welcome_message", "Welcome to OpenSimulator");
config.Set("inventory_plugin", "OpenSim.Data.SQLite.dll");
config.Set("inventory_source", "");
config.Set("userDatabase_plugin", "OpenSim.Data.SQLite.dll");
config.Set("user_source", "");
config.Set("asset_plugin", "OpenSim.Data.SQLite.dll");
- config.Set("asset_source", "");
+ config.Set("asset_source", "URI=file:Asset.db,version=3");
config.Set("LibrariesXMLFile", string.Format(".{0}inventory{0}Libraries.xml", Path.DirectorySeparatorChar));
config.Set("AssetSetsXMLFile", string.Format(".{0}assets{0}AssetSets.xml", Path.DirectorySeparatorChar));
config.Set("dump_assets_to_file", false);
@@ -288,11 +288,16 @@ namespace OpenSim
Thread.Sleep(3000);
}
- m_configSettings.StorageConnectionString = startupConfig.GetString("storage_connection_string");
- m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
- m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
- m_configSettings.AssetCache = startupConfig.GetString("AssetCache");
- m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
+ m_configSettings.StorageConnectionString
+ = startupConfig.GetString("storage_connection_string");
+ m_configSettings.EstateConnectionString
+ = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
+ m_configSettings.AssetStorage
+ = startupConfig.GetString("asset_database");
+ m_configSettings.AssetCache
+ = startupConfig.GetString("AssetCache", "OpenSim.Framework.Communications.Cache.AssetCache");
+ m_configSettings.ClientstackDll
+ = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
}
IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
diff --git a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
index 0a1de44..488e55b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
@@ -267,7 +267,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Currency.SampleMoney
// Helpers.TryParse(EBA, out EconomyBaseAccount);
// UserLevelPaysFees = startupConfig.GetInt("UserLevelPaysFees", -1);
- m_stipend = startupConfig.GetInt("UserStipend", 500);
+ m_stipend = startupConfig.GetInt("UserStipend", 1000);
m_minFundsBeforeRefresh = startupConfig.GetInt("IssueStipendWhenClientIsBelowAmount", 10);
m_keepMoneyAcrossLogins = startupConfig.GetBoolean("KeepMoneyAcrossLogins", true);
m_MoneyAddress = startupConfig.GetString("CurrencyServer", String.Empty);
diff --git a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
index aa33982..e5a01ef 100644
--- a/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Communications.Local
{
IConfig startupConfig = config.Configs["Communications"];
- if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTCommms") == "LocalComms"))
+ if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTComms") == "LocalComms"))
{
m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module");
m_enabled = true;
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 08e08c8..63f3db5 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -111,8 +111,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
- maxlisteners = config.Configs["Chat"].GetInt("max_listens_per_region", maxlisteners);
- maxhandles = config.Configs["Chat"].GetInt("max_listens_per_script", maxhandles);
+ maxlisteners = config.Configs["LL-Functions"].GetInt("max_listens_per_region", maxlisteners);
+ maxhandles = config.Configs["LL-Functions"].GetInt("max_listens_per_script", maxhandles);
}
catch (Exception)
{
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 11f7570..7b4a571 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
return;
m_allowGridGods = myConfig.GetBoolean("allow_grid_gods", false);
- m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", true);
+ m_bypassPermissions = !myConfig.GetBoolean("serverside_object_permissions", false);
m_propagatePermissions = myConfig.GetBoolean("propagate_permissions", true);
m_RegionOwnerIsGod = myConfig.GetBoolean("region_owner_is_god", true);
m_ParcelOwnerIsGod = myConfig.GetBoolean("parcel_owner_is_god", true);
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index 5b28430..d0211cd 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
byte[] imageData = null;
bool drawPrimVolume = true;
- bool textureTerrain = true;
+ bool textureTerrain = false;
try
{
diff --git a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
index 3013971..bc7e7b2 100644
--- a/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
+++ b/OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
//DataServices and networking
private string m_dataServices = "noservices";
- public string m_listener_port = "9000"; //TODO: Set default port over 9000
+ public string m_listener_port = NetworkServersInfo.DefaultHttpListenerPort.ToString();
public string m_hostname = "127.0.0.1";
//Update timers
@@ -101,14 +101,24 @@ namespace OpenSim.Region.DataSnapshot
try
{
m_enabled = config.Configs["DataSnapshot"].GetBoolean("index_sims", m_enabled);
- if (config.Configs["Startup"].GetBoolean("gridmode", true))
+ if (config.Configs["Startup"].GetBoolean("gridmode", false))
{
- m_gridinfo.Add("gridserverURL", config.Configs["Network"].GetString("grid_server_url", "harbl"));
- m_gridinfo.Add("userserverURL", config.Configs["Network"].GetString("user_server_url", "harbl"));
- m_gridinfo.Add("assetserverURL", config.Configs["Network"].GetString("asset_server_url", "harbl"));
+ m_gridinfo.Add(
+ "gridserverURL",
+ config.Configs["Network"].GetString(
+ "grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()));
+ m_gridinfo.Add(
+ "userserverURL",
+ config.Configs["Network"].GetString(
+ "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()));
+ m_gridinfo.Add(
+ "assetserverURL",
+ config.Configs["Network"].GetString(
+ "asset_server_url", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString()));
}
- m_gridinfo.Add("Name", config.Configs["DataSnapshot"].GetString("gridname", "harbl"));
+ m_gridinfo.Add(
+ "Name", config.Configs["DataSnapshot"].GetString("gridname", "the lost continent of hippo"));
m_exposure_level = config.Configs["DataSnapshot"].GetString("data_exposure", m_exposure_level);
m_period = config.Configs["DataSnapshot"].GetInt("default_snapshot_period", m_period);
m_maxStales = config.Configs["DataSnapshot"].GetInt("max_changes_before_update", m_maxStales);
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index 601cd82..732d99b 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -366,8 +366,8 @@ namespace OpenSim.Region.Physics.OdePlugin
gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
- worldHashspaceLow = physicsconfig.GetInt("world_hashspace_low", -4);
- worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_high", 128);
+ worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
+ worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
@@ -380,7 +380,7 @@ namespace OpenSim.Region.Physics.OdePlugin
nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
- mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.1f);
+ mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
@@ -411,7 +411,7 @@ namespace OpenSim.Region.Physics.OdePlugin
meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
- m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", true);
+ m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
if (Environment.OSVersion.Platform == PlatformID.Unix)
{
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
index 2ebc8b7..bb79da4 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
/// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
///
public static long maxFunctionExecutionTimens;
+
///
/// Enforce max execution time
///
public static bool EnforceMaxExecutionTime;
+
///
/// Kill script (unload) when it exceeds execution time
///
@@ -163,7 +165,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
// Refresh config
numberOfThreads = m_ScriptEngine.ScriptConfigSource.GetInt("NumberOfScriptThreads", 2);
maxFunctionExecutionTimems = m_ScriptEngine.ScriptConfigSource.GetInt("MaxEventExecutionTimeMs", 5000);
- EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", false);
+ EnforceMaxExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("EnforceMaxEventExecutionTime", true);
KillScriptOnMaxFunctionExecutionTime = m_ScriptEngine.ScriptConfigSource.GetBoolean("DeactivateScriptOnTimeout", false);
EventExecutionMaxQueueSize = m_ScriptEngine.ScriptConfigSource.GetInt("EventExecutionMaxQueueSize", 300);
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
index bdf80c6..c2b07fc 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
public void ReadConfig()
{
- RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
+ RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 0);
if (m_EventQueueManager != null) m_EventQueueManager.ReadConfig();
if (m_EventManager != null) m_EventManager.ReadConfig();
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
///
private void DeleteOldFiles()
{
-
// CREATE FOLDER IF IT DOESNT EXIST
if (!Directory.Exists(ScriptEnginesPath))
{
--
cgit v1.1