diff options
author | Melanie Thielker | 2008-07-20 15:19:26 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-20 15:19:26 +0000 |
commit | 8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e (patch) | |
tree | 33f604591d56737cd417975911612efa0fac3bd3 /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | Change SQLite argument marker from the more standard '@' to the ':' supported (diff) | |
download | opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.zip opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.gz opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.bz2 opensim-SC_OLD-8ae7dc628b2681b02c43a5acd1e1bdf4f33b1f3e.tar.xz |
Make the max sizes of physical and nonphysical prims configurable in OpenSim.ini
Defaulted to 65536 and 10, respectively
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 0ab729d..f602e9f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -88,6 +88,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
88 | /// Are we applying physics to any of the prims in this scene? | 88 | /// Are we applying physics to any of the prims in this scene? |
89 | /// </summary> | 89 | /// </summary> |
90 | public bool m_physicalPrim; | 90 | public bool m_physicalPrim; |
91 | public float m_maxNonphys = 65536; | ||
92 | public float m_maxPhys = 10; | ||
91 | 93 | ||
92 | public bool m_seeIntoRegionFromNeighbor; | 94 | public bool m_seeIntoRegionFromNeighbor; |
93 | public int MaxUndoCount = 5; | 95 | public int MaxUndoCount = 5; |
@@ -308,6 +310,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
308 | m_simulatorVersion = simulatorVersion | 310 | m_simulatorVersion = simulatorVersion |
309 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | 311 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() |
310 | + " PhysPrim:" + m_physicalPrim.ToString(); | 312 | + " PhysPrim:" + m_physicalPrim.ToString(); |
313 | |||
314 | try | ||
315 | { | ||
316 | IConfig startupConfig = m_config.Configs["Startup"]; | ||
317 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); | ||
318 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); | ||
319 | } | ||
320 | catch (Exception) | ||
321 | { | ||
322 | m_log.Warn("Failed to load StartupConfig"); | ||
323 | } | ||
324 | |||
311 | } | 325 | } |
312 | 326 | ||
313 | #endregion | 327 | #endregion |
@@ -1146,7 +1160,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1146 | } | 1160 | } |
1147 | catch (Exception) | 1161 | catch (Exception) |
1148 | { | 1162 | { |
1149 | m_log.Warn("Failed to load StarupConfg"); | 1163 | m_log.Warn("Failed to load StartupConfig"); |
1150 | } | 1164 | } |
1151 | 1165 | ||
1152 | if (drawPrimVolume) | 1166 | if (drawPrimVolume) |