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/Api/Implementation/OSSL_Api.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/Api/Implementation/OSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index d791885..7f3d84d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -672,13 +672,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
672 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimFloatOnWater"); | 672 | CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimFloatOnWater"); |
673 | 673 | ||
674 | m_host.AddScriptLPS(1); | 674 | m_host.AddScriptLPS(1); |
675 | if (m_host.ParentGroup != null) | 675 | |
676 | { | 676 | if (m_host.ParentGroup.RootPart != null) |
677 | if (m_host.ParentGroup.RootPart != null) | 677 | m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN); |
678 | { | ||
679 | m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN); | ||
680 | } | ||
681 | } | ||
682 | } | 678 | } |
683 | 679 | ||
684 | // Teleport functions | 680 | // Teleport functions |