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/ScriptEngine/XEngine | |
| 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 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index 08dc71e..5c4174e 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
| @@ -99,11 +99,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 99 | m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); | 99 | m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount); |
| 100 | 100 | ||
| 101 | part = part.ParentGroup.RootPart; | 101 | part = part.ParentGroup.RootPart; |
| 102 | 102 | money(part.LocalId, agentID, amount); | |
| 103 | if (part != null) | ||
| 104 | { | ||
| 105 | money(part.LocalId, agentID, amount); | ||
| 106 | } | ||
| 107 | } | 103 | } |
| 108 | 104 | ||
| 109 | /// <summary> | 105 | /// <summary> |