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/XEngine | |
| parent | Fix a bug where the non-root parts of rezzed objects that had previously been... (diff) | |
| download | opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.zip opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.gz opensim-SC-095b3e5756bb3160b30c9c5670ba008fa13d2e66.tar.bz2 opensim-SC-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/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 0ac8b5c..08dc71e 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
| @@ -97,8 +97,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 97 | return; | 97 | return; |
| 98 | 98 | ||
| 99 | m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); | 99 | m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); |
| 100 | if (part.ParentGroup != null) | 100 | |
| 101 | part = part.ParentGroup.RootPart; | 101 | part = part.ParentGroup.RootPart; |
| 102 | 102 | ||
| 103 | if (part != null) | 103 | if (part != null) |
| 104 | { | 104 | { |