From 169a353cca000f2e57b3895d6110c18bd5757137 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Fri, 24 Jul 2009 06:59:27 +0000 Subject: * minor ccc --- OpenSim/Region/Application/Application.cs | 3 +++ OpenSim/Region/Framework/Scenes/Scene.cs | 6 ++++++ OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 +++++++- 3 files changed, 16 insertions(+), 1 deletion(-) 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 private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) { if (_IsHandlingException) + { return; + } + _IsHandlingException = true; // TODO: Add config option to allow users to turn off error reporting // 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 m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys); if (RegionInfo.NonphysPrimMax > 0) + { m_maxNonphys = RegionInfo.NonphysPrimMax; + } m_maxPhys = startupConfig.GetFloat("PhysicalPrimMax", m_maxPhys); if (RegionInfo.PhysPrimMax > 0) + { m_maxPhys = RegionInfo.PhysPrimMax; + } // Here, if clamping is requested in either global or // local config, it will be used // m_clampPrimSize = startupConfig.GetBoolean("ClampPrimSize", m_clampPrimSize); if (RegionInfo.ClampPrimSize) + { m_clampPrimSize = true; + } m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries); 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 foreach (SceneObjectPart part in m_parts.Values) { if (Object.ReferenceEquals(part, m_rootPart)) + { continue; - if (part.LocalId==0) + } + + if (part.LocalId == 0) + { part.LocalId = m_scene.AllocateLocalId(); + } + part.ParentID = m_rootPart.LocalId; //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); } -- cgit v1.1