aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs2
-rw-r--r--OpenSim/Region/Application/OpenSim.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 6a103bd..7c335a7 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -292,7 +292,7 @@ namespace OpenSim
292 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString); 292 m_configSettings.EstateConnectionString = startupConfig.GetString("estate_connection_string", m_configSettings.StorageConnectionString);
293 m_configSettings.AssetStorage = startupConfig.GetString("asset_database"); 293 m_configSettings.AssetStorage = startupConfig.GetString("asset_database");
294 m_configSettings.AssetCache = startupConfig.GetString("AssetCache"); 294 m_configSettings.AssetCache = startupConfig.GetString("AssetCache");
295 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin"); 295 m_configSettings.ClientstackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
296 } 296 }
297 297
298 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"]; 298 IConfig standaloneConfig = m_config.Source.Configs["StandAlone"];
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 69dfac5..d8a9b4c 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -68,8 +68,8 @@ namespace OpenSim
68 68
69 if (startupConfig != null) 69 if (startupConfig != null)
70 { 70 {
71 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", String.Empty); 71 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
72 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", String.Empty); 72 m_shutdownCommandsFile = startupConfig.GetString("shutdown_console_commands_file", "shutdown_commands.txt");
73 73
74 m_gui = startupConfig.GetBoolean("gui", false); 74 m_gui = startupConfig.GetBoolean("gui", false);
75 75
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5cb9724..08a4a7c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -81,7 +81,7 @@ namespace OpenSim.Region.Framework.Scenes
81 /// Are we applying physics to any of the prims in this scene? 81 /// Are we applying physics to any of the prims in this scene?
82 /// </summary> 82 /// </summary>
83 public bool m_physicalPrim; 83 public bool m_physicalPrim;
84 public float m_maxNonphys = 65536; 84 public float m_maxNonphys = 256;
85 public float m_maxPhys = 10; 85 public float m_maxPhys = 10;
86 public bool m_clampPrimSize = false; 86 public bool m_clampPrimSize = false;
87 public bool m_trustBinaries = false; 87 public bool m_trustBinaries = false;
@@ -342,11 +342,11 @@ namespace OpenSim.Region.Framework.Scenes
342 // Region config overrides global config 342 // Region config overrides global config
343 // 343 //
344 IConfig startupConfig = m_config.Configs["Startup"]; 344 IConfig startupConfig = m_config.Configs["Startup"];
345 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); 345 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
346 if (RegionInfo.NonphysPrimMax > 0) 346 if (RegionInfo.NonphysPrimMax > 0)
347 m_maxNonphys = RegionInfo.NonphysPrimMax; 347 m_maxNonphys = RegionInfo.NonphysPrimMax;
348 348
349 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); 349 m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys);
350 350
351 if (RegionInfo.PhysPrimMax > 0) 351 if (RegionInfo.PhysPrimMax > 0)
352 m_maxPhys = RegionInfo.PhysPrimMax; 352 m_maxPhys = RegionInfo.PhysPrimMax;
@@ -354,12 +354,12 @@ namespace OpenSim.Region.Framework.Scenes
354 // Here, if clamping is requested in either global or 354 // Here, if clamping is requested in either global or
355 // local config, it will be used 355 // local config, it will be used
356 // 356 //
357 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", false); 357 m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize);
358 if (RegionInfo.ClampPrimSize) 358 if (RegionInfo.ClampPrimSize)
359 m_clampPrimSize = true; 359 m_clampPrimSize = true;
360 360
361 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", false); 361 m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
362 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", false); 362 m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
363 m_dontPersistBefore = 363 m_dontPersistBefore =
364 startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE); 364 startupConfig.GetLong("MinimumTimeBeforePersistenceConsidered", DEFAULT_MIN_TIME_FOR_PERSISTENCE);
365 m_dontPersistBefore *= 10000000; 365 m_dontPersistBefore *= 10000000;