diff options
author | lbsa71 | 2009-07-24 06:59:27 +0000 |
---|---|---|
committer | lbsa71 | 2009-07-24 06:59:27 +0000 |
commit | 169a353cca000f2e57b3895d6110c18bd5757137 (patch) | |
tree | a83bceebe2c28a340a643f77de8bff702918180c /OpenSim | |
parent | * Updates RESTInterregionComms and LocalInterregionComms to the new region mo... (diff) | |
download | opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.zip opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.tar.gz opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.tar.bz2 opensim-SC_OLD-169a353cca000f2e57b3895d6110c18bd5757137.tar.xz |
* minor ccc
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 |
3 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index ff17086..ad157c6 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -138,7 +138,10 @@ namespace OpenSim | |||
138 | private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) | 138 | private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) |
139 | { | 139 | { |
140 | if (_IsHandlingException) | 140 | if (_IsHandlingException) |
141 | { | ||
141 | return; | 142 | return; |
143 | } | ||
144 | |||
142 | _IsHandlingException = true; | 145 | _IsHandlingException = true; |
143 | // TODO: Add config option to allow users to turn off error reporting | 146 | // TODO: Add config option to allow users to turn off error reporting |
144 | // TODO: Post error report (disabled for now) | 147 | // TODO: Post error report (disabled for now) |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index c39cb2d..0b466f7 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -401,19 +401,25 @@ namespace OpenSim.Region.Framework.Scenes | |||
401 | 401 | ||
402 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); | 402 | m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); |
403 | if (RegionInfo.NonphysPrimMax > 0) | 403 | if (RegionInfo.NonphysPrimMax > 0) |
404 | { | ||
404 | m_maxNonphys = RegionInfo.NonphysPrimMax; | 405 | m_maxNonphys = RegionInfo.NonphysPrimMax; |
406 | } | ||
405 | 407 | ||
406 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); | 408 | m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); |
407 | 409 | ||
408 | if (RegionInfo.PhysPrimMax > 0) | 410 | if (RegionInfo.PhysPrimMax > 0) |
411 | { | ||
409 | m_maxPhys = RegionInfo.PhysPrimMax; | 412 | m_maxPhys = RegionInfo.PhysPrimMax; |
413 | } | ||
410 | 414 | ||
411 | // Here, if clamping is requested in either global or | 415 | // Here, if clamping is requested in either global or |
412 | // local config, it will be used | 416 | // local config, it will be used |
413 | // | 417 | // |
414 | m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize); | 418 | m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize); |
415 | if (RegionInfo.ClampPrimSize) | 419 | if (RegionInfo.ClampPrimSize) |
420 | { | ||
416 | m_clampPrimSize = true; | 421 | m_clampPrimSize = true; |
422 | } | ||
417 | 423 | ||
418 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); | 424 | m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); |
419 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); | 425 | m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 220558b..0f7bd00 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -501,9 +501,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
501 | foreach (SceneObjectPart part in m_parts.Values) | 501 | foreach (SceneObjectPart part in m_parts.Values) |
502 | { | 502 | { |
503 | if (Object.ReferenceEquals(part, m_rootPart)) | 503 | if (Object.ReferenceEquals(part, m_rootPart)) |
504 | { | ||
504 | continue; | 505 | continue; |
505 | if (part.LocalId==0) | 506 | } |
507 | |||
508 | if (part.LocalId == 0) | ||
509 | { | ||
506 | part.LocalId = m_scene.AllocateLocalId(); | 510 | part.LocalId = m_scene.AllocateLocalId(); |
511 | } | ||
512 | |||
507 | part.ParentID = m_rootPart.LocalId; | 513 | part.ParentID = m_rootPart.LocalId; |
508 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); | 514 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); |
509 | } | 515 | } |