diff options
| author | radams1 | 2010-02-02 16:20:02 -0800 |
|---|---|---|
| committer | Melanie | 2010-02-03 00:15:04 +0000 |
| commit | 88d0fc3b093e1ae79ef17e2496348251e196a5fa (patch) | |
| tree | 7dcd268f19f8f4a01905c7fd7a2fb25e38ee4636 /OpenSim/Region/Framework/Scenes | |
| parent | minor: rename GetScriptPrimType() to GetPrimType() (diff) | |
| download | opensim-SC-88d0fc3b093e1ae79ef17e2496348251e196a5fa.zip opensim-SC-88d0fc3b093e1ae79ef17e2496348251e196a5fa.tar.gz opensim-SC-88d0fc3b093e1ae79ef17e2496348251e196a5fa.tar.bz2 opensim-SC-88d0fc3b093e1ae79ef17e2496348251e196a5fa.tar.xz | |
allow terrain collision events after regular collision check
Signed-off-by: Melanie <melanie@t-data.com>
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index ef9005f..b1c6fb9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1921,7 +1921,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1921 | foreach (uint localId in startedColliders) | 1921 | foreach (uint localId in startedColliders) |
| 1922 | { | 1922 | { |
| 1923 | if (localId == 0) | 1923 | if (localId == 0) |
| 1924 | return; | 1924 | continue; |
| 1925 | // always running this check because if the user deletes the object it would return a null reference. | 1925 | // always running this check because if the user deletes the object it would return a null reference. |
| 1926 | if (m_parentGroup == null) | 1926 | if (m_parentGroup == null) |
| 1927 | return; | 1927 | return; |
| @@ -2057,7 +2057,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2057 | { | 2057 | { |
| 2058 | // always running this check because if the user deletes the object it would return a null reference. | 2058 | // always running this check because if the user deletes the object it would return a null reference. |
| 2059 | if (localId == 0) | 2059 | if (localId == 0) |
| 2060 | return; | 2060 | continue; |
| 2061 | 2061 | ||
| 2062 | if (m_parentGroup == null) | 2062 | if (m_parentGroup == null) |
| 2063 | return; | 2063 | return; |
| @@ -2189,7 +2189,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2189 | foreach (uint localId in endedColliders) | 2189 | foreach (uint localId in endedColliders) |
| 2190 | { | 2190 | { |
| 2191 | if (localId == 0) | 2191 | if (localId == 0) |
| 2192 | return; | 2192 | continue; |
| 2193 | 2193 | ||
| 2194 | // always running this check because if the user deletes the object it would return a null reference. | 2194 | // always running this check because if the user deletes the object it would return a null reference. |
| 2195 | if (m_parentGroup == null) | 2195 | if (m_parentGroup == null) |