diff options
| author | Justin Clark-Casey (justincc) | 2011-09-01 01:22:28 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-01 01:22:28 +0100 |
| commit | 095b3e5756bb3160b30c9c5670ba008fa13d2e66 (patch) | |
| tree | 0052b92cf46d42d714740bb4c7404edbdbaea0de /OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |
| parent | Fix a bug where the non-root parts of rezzed objects that had previously been... (diff) | |
| download | opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.zip opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.gz opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.bz2 opensim-SC_OLD-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.xz | |
Remove pointless cluttering SOP.ParentGroup != null checks.
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index ef9b2ac..6e9f3ec 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -766,13 +766,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 766 | else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) | 766 | else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException)) |
| 767 | { | 767 | { |
| 768 | m_InSelfDelete = true; | 768 | m_InSelfDelete = true; |
| 769 | if (part != null && part.ParentGroup != null) | 769 | if (part != null) |
| 770 | m_Engine.World.DeleteSceneObject(part.ParentGroup, false); | 770 | m_Engine.World.DeleteSceneObject(part.ParentGroup, false); |
| 771 | } | 771 | } |
| 772 | else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException)) | 772 | else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException)) |
| 773 | { | 773 | { |
| 774 | m_InSelfDelete = true; | 774 | m_InSelfDelete = true; |
| 775 | if (part != null && part.ParentGroup != null) | 775 | if (part != null) |
| 776 | part.Inventory.RemoveInventoryItem(m_ItemID); | 776 | part.Inventory.RemoveInventoryItem(m_ItemID); |
| 777 | } | 777 | } |
| 778 | } | 778 | } |