ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Make all coded defaults match settings in OpenSim.ini.example

Browse Source 
* 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)
This commit is contained in:
Justin Clarke Casey
2009-03-11 18:02:22 +00:00
parent 5a6e502266
commit acad0328b2
17 changed files with 133 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -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"];

2
OpenSim/Region/CoreModules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs
View File

@@ -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);

2
OpenSim/Region/CoreModules/Communications/Local/LocalInterregionComms.cs
View File

@@ -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;

4
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
View File

@@ -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)
{

2
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -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);

2
OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
View File

@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
byte[] imageData = null;
bool drawPrimVolume = true;
bool textureTerrain = true;
bool textureTerrain = false;
try
{

22
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@@ -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);

8
OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
View File

@@ -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)
{

4
OpenSim/Region/ScriptEngine/DotNetEngine/EventQueueManager.cs
View File

@@ -112,10 +112,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine
/// WARNING! ONLY UPDATE maxFunctionExecutionTimems, NEVER THIS DIRECTLY.
/// </summary>
public static long maxFunctionExecutionTimens;
/// <summary>
/// Enforce max execution time
/// </summary>
public static bool EnforceMaxExecutionTime;
/// <summary>
/// Kill script (unload) when it exceeds execution time
/// </summary>
@@ -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);

2
OpenSim/Region/ScriptEngine/DotNetEngine/ScriptEngine.cs
View File

@@ -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();

4
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -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);
}

3
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@@ -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))
{