diff options
| author | Justin Clark-Casey (justincc) | 2010-02-03 22:14:58 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-02-03 22:14:58 +0000 |
| commit | b1dfcccc9add3be35ab04be32444ce5045df5d2a (patch) | |
| tree | 15274bd95737a012773c2ddb64bc984f271d50af /OpenSim/Region/Framework | |
| parent | minor: remove one mono compiler warning (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b1dfcccc9add3be35ab04be32444ce5045df5d2a.zip opensim-SC_OLD-b1dfcccc9add3be35ab04be32444ce5045df5d2a.tar.gz opensim-SC_OLD-b1dfcccc9add3be35ab04be32444ce5045df5d2a.tar.bz2 opensim-SC_OLD-b1dfcccc9add3be35ab04be32444ce5045df5d2a.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 d012d3e..8d84557 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
| @@ -1930,7 +1930,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1930 | foreach (uint localId in startedColliders) | 1930 | foreach (uint localId in startedColliders) |
| 1931 | { | 1931 | { |
| 1932 | if (localId == 0) | 1932 | if (localId == 0) |
| 1933 | return; | 1933 | continue; |
| 1934 | // always running this check because if the user deletes the object it would return a null reference. | 1934 | // always running this check because if the user deletes the object it would return a null reference. |
| 1935 | if (m_parentGroup == null) | 1935 | if (m_parentGroup == null) |
| 1936 | return; | 1936 | return; |
| @@ -2066,7 +2066,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2066 | { | 2066 | { |
| 2067 | // always running this check because if the user deletes the object it would return a null reference. | 2067 | // always running this check because if the user deletes the object it would return a null reference. |
| 2068 | if (localId == 0) | 2068 | if (localId == 0) |
| 2069 | return; | 2069 | continue; |
| 2070 | 2070 | ||
| 2071 | if (m_parentGroup == null) | 2071 | if (m_parentGroup == null) |
| 2072 | return; | 2072 | return; |
| @@ -2198,7 +2198,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2198 | foreach (uint localId in endedColliders) | 2198 | foreach (uint localId in endedColliders) |
| 2199 | { | 2199 | { |
| 2200 | if (localId == 0) | 2200 | if (localId == 0) |
| 2201 | return; | 2201 | continue; |
| 2202 | 2202 | ||
| 2203 | // always running this check because if the user deletes the object it would return a null reference. | 2203 | // always running this check because if the user deletes the object it would return a null reference. |
| 2204 | if (m_parentGroup == null) | 2204 | if (m_parentGroup == null) |