diff options
author | Jeff Ames | 2008-07-23 13:24:25 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-23 13:24:25 +0000 |
commit | 80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch) | |
tree | 47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Region/Environment/Scenes/Scene.cs | |
parent | get rid of some LLQuaternion == null checks. Because LLQuaternion is (diff) | |
download | opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2 opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz |
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index ae5a3c7..7ff5024 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -88,8 +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; | 91 | public float m_maxNonphys = 65536; |
92 | public float m_maxPhys = 10; | 92 | public float m_maxPhys = 10; |
93 | 93 | ||
94 | public bool m_seeIntoRegionFromNeighbor; | 94 | public bool m_seeIntoRegionFromNeighbor; |
95 | public int MaxUndoCount = 5; | 95 | public int MaxUndoCount = 5; |
@@ -272,7 +272,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
272 | 272 | ||
273 | // Load region settings | 273 | // Load region settings |
274 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); | 274 | m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); |
275 | if(m_storageManager.EstateDataStore != null) | 275 | if (m_storageManager.EstateDataStore != null) |
276 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); | 276 | m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); |
277 | 277 | ||
278 | 278 | ||
@@ -311,16 +311,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
311 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() | 311 | + " ChilTasks:" + m_seeIntoRegionFromNeighbor.ToString() |
312 | + " PhysPrim:" + m_physicalPrim.ToString(); | 312 | + " PhysPrim:" + m_physicalPrim.ToString(); |
313 | 313 | ||
314 | try | 314 | try |
315 | { | 315 | { |
316 | IConfig startupConfig = m_config.Configs["Startup"]; | 316 | IConfig startupConfig = m_config.Configs["Startup"]; |
317 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); | 317 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", 65536.0f); |
318 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); | 318 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", 10.0f); |
319 | } | 319 | } |
320 | catch (Exception) | 320 | catch (Exception) |
321 | { | 321 | { |
322 | m_log.Warn("Failed to load StartupConfig"); | 322 | m_log.Warn("Failed to load StartupConfig"); |
323 | } | 323 | } |
324 | 324 | ||
325 | } | 325 | } |
326 | 326 | ||
@@ -2505,8 +2505,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2505 | /// <param name="capsObjectPath"></param> | 2505 | /// <param name="capsObjectPath"></param> |
2506 | public void AddCapsHandler(LLUUID agentId) | 2506 | public void AddCapsHandler(LLUUID agentId) |
2507 | { | 2507 | { |
2508 | if(RegionInfo.EstateSettings.IsBanned(agentId)) | 2508 | if (RegionInfo.EstateSettings.IsBanned(agentId)) |
2509 | return; | 2509 | return; |
2510 | String capsObjectPath = GetCapsPath(agentId); | 2510 | String capsObjectPath = GetCapsPath(agentId); |
2511 | 2511 | ||
2512 | m_log.DebugFormat( | 2512 | m_log.DebugFormat( |