OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update some ini defaults in code - all defaults from beginning of OpenSim.ini.example thru DefaultScriptEngine = "XEngine"

0.6.5-rc1
Dahlia Trimble 2009-03-11 09:31:02 +00:00
parent b6b83be562
commit 669aa46bff
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,7 @@ namespace OpenSim
m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
m_configSettings.AssetCache = startupConfig.GetString("AssetCache"); m_configSettings.AssetCache = startupConfig.GetString("AssetCache");
m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin"); m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
} }
IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];

4
OpenSim/Region/Application/OpenSim.cs
View File

@ -68,8 +68,8 @@ namespace OpenSim
if (startupConfig != null) if (startupConfig != null)
{ {
m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "shutdown_commands.txt");
m_gui = startupConfig.GetBoolean("gui", false); m_gui = startupConfig.GetBoolean("gui", false);

12
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -81,7 +81,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Are we applying physics to any of the prims in this scene? /// Are we applying physics to any of the prims in this scene?
/// </summary> /// </summary>
public bool m_physicalPrim; public bool m_physicalPrim;
public float m_maxNonphys = 65536; public float m_maxNonphys = 256;
public float m_maxPhys = 10; public float m_maxPhys = 10;
public bool m_clampPrimSize = false; public bool m_clampPrimSize = false;
public bool m_trustBinaries = false; public bool m_trustBinaries = false;
@ -342,11 +342,11 @@ namespace OpenSim.Region.Framework.Scenes
// Region config overrides global config // Region config overrides global config
// //
IConfig startupConfig = m_config.Configs["Startup"]; IConfig startupConfig = m_config.Configs["Startup"];
m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
if (RegionInfo.NonphysPrimMax > 0) if (RegionInfo.NonphysPrimMax > 0)
m_maxNonphys = RegionInfo.NonphysPrimMax; m_maxNonphys = RegionInfo.NonphysPrimMax;
m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
if (RegionInfo.PhysPrimMax > 0) if (RegionInfo.PhysPrimMax > 0)
m_maxPhys = RegionInfo.PhysPrimMax; m_maxPhys = RegionInfo.PhysPrimMax;
@ -354,12 +354,12 @@ namespace OpenSim.Region.Framework.Scenes
// Here, if clamping is requested in either global or // Here, if clamping is requested in either global or
// local config, it will be used // local config, it will be used
// //
m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
if (RegionInfo.ClampPrimSize) if (RegionInfo.ClampPrimSize)
m_clampPrimSize = true; m_clampPrimSize = true;
m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", false); m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", false); m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
m_dontPersistBefore = m_dontPersistBefore =
startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
m_dontPersistBefore *= 10000000; m_dontPersistBefore *= 10000000;