diff options
| author | Justin Clark-Casey (justincc) | 2011-08-31 16:46:43 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-08-31 16:46:43 +0100 |
| commit | 54839d28ad0bf2a2e613dd698e8927823ed64349 (patch) | |
| tree | b6ae7aa6249fc129561b37c8d393a8fd476fe81a /OpenSim | |
| parent | minor: seal up another instance of using the appearance list without locking (diff) | |
| download | opensim-SC_OLD-54839d28ad0bf2a2e613dd698e8927823ed64349.zip opensim-SC_OLD-54839d28ad0bf2a2e613dd698e8927823ed64349.tar.gz opensim-SC_OLD-54839d28ad0bf2a2e613dd698e8927823ed64349.tar.bz2 opensim-SC_OLD-54839d28ad0bf2a2e613dd698e8927823ed64349.tar.xz | |
remove pointless m_attachments == null check since this field is never null
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index e3b7c72..43a845c 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -945,7 +945,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 945 | // haven't started yet. | 945 | // haven't started yet. |
| 946 | lock (m_attachments) | 946 | lock (m_attachments) |
| 947 | { | 947 | { |
| 948 | if (wasChild && m_attachments != null && m_attachments.Count > 0) | 948 | if (wasChild && HasAttachments()) |
| 949 | { | 949 | { |
| 950 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); | 950 | m_log.DebugFormat("[SCENE PRESENCE]: Restarting scripts in attachments..."); |
| 951 | // Resume scripts | 951 | // Resume scripts |