Massive tab and trailing space cleanup

This commit is contained in:
Melanie Thielker
2017-01-05 19:07:37 +00:00
parent e88e2945e9
commit b16abc8166
959 changed files with 23646 additions and 23646 deletions

View File

@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Scenes
/// Running => PreRemove, Removing
/// PreRemove => Running, Removing
/// Removing => Removed
///
///
/// All other methods should only see the scene presence in running state - this is the normal operational state
/// Removed state occurs when the presence has been removed. This is the end state with no exit.
/// </remarks>
@@ -89,13 +89,13 @@ namespace OpenSim.Region.Framework.Scenes
else if (newState == ScenePresenceState.PreRemove && m_state == ScenePresenceState.Running)
transitionOkay = true;
else if (newState == ScenePresenceState.Removing)
{
{
if (m_state == ScenePresenceState.Running || m_state == ScenePresenceState.PreRemove)
transitionOkay = true;
}
else if (newState == ScenePresenceState.Removed && m_state == ScenePresenceState.Removing)
transitionOkay = true;
}
}
if (!transitionOkay)
{