mirror of
https://github.com/opensim/opensim.git
synced 2026-05-15 03:15:41 +08:00
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
This commit is contained in:
@@ -1930,7 +1930,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
foreach (uint localId in startedColliders)
|
||||
{
|
||||
if (localId == 0)
|
||||
return;
|
||||
continue;
|
||||
// always running this check because if the user deletes the object it would return a null reference.
|
||||
if (m_parentGroup == null)
|
||||
return;
|
||||
@@ -2066,7 +2066,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
{
|
||||
// always running this check because if the user deletes the object it would return a null reference.
|
||||
if (localId == 0)
|
||||
return;
|
||||
continue;
|
||||
|
||||
if (m_parentGroup == null)
|
||||
return;
|
||||
@@ -2198,7 +2198,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||
foreach (uint localId in endedColliders)
|
||||
{
|
||||
if (localId == 0)
|
||||
return;
|
||||
continue;
|
||||
|
||||
// always running this check because if the user deletes the object it would return a null reference.
|
||||
if (m_parentGroup == null)
|
||||
|
||||
Reference in New Issue
Block a user