diff options
author | Justin Clark-Casey (justincc) | 2011-09-01 02:09:41 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-01 02:11:00 +0100 |
commit | 7eca929686bd2db1cb42f5c9740fd1d186cdc8b1 (patch) | |
tree | 775f07f365acb56bc6043831d5832c2dac468ade /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID() (diff) | |
download | opensim-SC_OLD-7eca929686bd2db1cb42f5c9740fd1d186cdc8b1.zip opensim-SC_OLD-7eca929686bd2db1cb42f5c9740fd1d186cdc8b1.tar.gz opensim-SC_OLD-7eca929686bd2db1cb42f5c9740fd1d186cdc8b1.tar.bz2 opensim-SC_OLD-7eca929686bd2db1cb42f5c9740fd1d186cdc8b1.tar.xz |
Eliminate pointless checks of SOG.RootPart != null
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 7f5aea7..9794a34 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1743,14 +1743,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1743 | foreach (SceneObjectGroup group in PrimsFromDB) | 1743 | foreach (SceneObjectGroup group in PrimsFromDB) |
1744 | { | 1744 | { |
1745 | EventManager.TriggerOnSceneObjectLoaded(group); | 1745 | EventManager.TriggerOnSceneObjectLoaded(group); |
1746 | |||
1747 | if (group.RootPart == null) | ||
1748 | { | ||
1749 | m_log.ErrorFormat( | ||
1750 | "[SCENE]: Found a SceneObjectGroup with m_rootPart == null and {0} children", | ||
1751 | group.Parts == null ? 0 : group.PrimCount); | ||
1752 | } | ||
1753 | |||
1754 | AddRestoredSceneObject(group, true, true); | 1746 | AddRestoredSceneObject(group, true, true); |
1755 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1747 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
1756 | rootPart.Flags &= ~PrimFlags.Scripted; | 1748 | rootPart.Flags &= ~PrimFlags.Scripted; |
@@ -4215,7 +4207,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
4215 | // their scripts will actually run. | 4207 | // their scripts will actually run. |
4216 | // -- Leaf, Tue Aug 12 14:17:05 EDT 2008 | 4208 | // -- Leaf, Tue Aug 12 14:17:05 EDT 2008 |
4217 | SceneObjectPart parent = part.ParentGroup.RootPart; | 4209 | SceneObjectPart parent = part.ParentGroup.RootPart; |
4218 | if (parent != null && part.ParentGroup.IsAttachment) | 4210 | if (part.ParentGroup.IsAttachment) |
4219 | return ScriptDanger(parent, parent.GetWorldPosition()); | 4211 | return ScriptDanger(parent, parent.GetWorldPosition()); |
4220 | else | 4212 | else |
4221 | return ScriptDanger(part, part.GetWorldPosition()); | 4213 | return ScriptDanger(part, part.GetWorldPosition()); |
@@ -5015,7 +5007,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
5015 | if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0) | 5007 | if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0) |
5016 | { | 5008 | { |
5017 | delete = true; | 5009 | delete = true; |
5018 | } else { | 5010 | } |
5011 | else | ||
5012 | { | ||
5019 | ILandObject parcel = LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y); | 5013 | ILandObject parcel = LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y); |
5020 | 5014 | ||
5021 | if (parcel == null || parcel.LandData.Name == "NO LAND") | 5015 | if (parcel == null || parcel.LandData.Name == "NO LAND") |