diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs index acfdaef..0a24555 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferStateMachine.cs | |||
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
169 | } | 169 | } |
170 | else | 170 | else |
171 | { | 171 | { |
172 | if (newState == AgentTransferState.Cancelling | 172 | if (newState == AgentTransferState.Cancelling |
173 | && (oldState == AgentTransferState.Preparing || oldState == AgentTransferState.Transferring)) | 173 | && (oldState == AgentTransferState.Preparing || oldState == AgentTransferState.Transferring)) |
174 | { | 174 | { |
175 | transitionOkay = true; | 175 | transitionOkay = true; |
@@ -181,7 +181,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
181 | } | 181 | } |
182 | 182 | ||
183 | if (!transitionOkay) | 183 | if (!transitionOkay) |
184 | failureMessage | 184 | failureMessage |
185 | = string.Format( | 185 | = string.Format( |
186 | "Agent with ID {0} is not allowed to move from old transit state {1} to new state {2} in {3}", | 186 | "Agent with ID {0} is not allowed to move from old transit state {1} to new state {2} in {3}", |
187 | id, oldState, newState, m_mod.Scene.RegionInfo.RegionName); | 187 | id, oldState, newState, m_mod.Scene.RegionInfo.RegionName); |
@@ -192,7 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
192 | m_agentsInTransit[id] = newState; | 192 | m_agentsInTransit[id] = newState; |
193 | 193 | ||
194 | // m_log.DebugFormat( | 194 | // m_log.DebugFormat( |
195 | // "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}", | 195 | // "[ENTITY TRANSFER STATE MACHINE]: Changed agent with id {0} from state {1} to {2} in {3}", |
196 | // id, oldState, newState, m_mod.Scene.Name); | 196 | // id, oldState, newState, m_mod.Scene.Name); |
197 | } | 197 | } |
198 | else if (failIfNotOkay) | 198 | else if (failIfNotOkay) |
@@ -204,11 +204,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
204 | // { | 204 | // { |
205 | // if (oldState != null) | 205 | // if (oldState != null) |
206 | // m_log.DebugFormat( | 206 | // m_log.DebugFormat( |
207 | // "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}", | 207 | // "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} from state {1} to {2} in {3}", |
208 | // id, oldState, newState, m_mod.Scene.Name); | 208 | // id, oldState, newState, m_mod.Scene.Name); |
209 | // else | 209 | // else |
210 | // m_log.DebugFormat( | 210 | // m_log.DebugFormat( |
211 | // "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit", | 211 | // "[ENTITY TRANSFER STATE MACHINE]: Ignored change of agent with id {0} to state {1} in {2} since agent not in transit", |
212 | // id, newState, m_mod.Scene.Name); | 212 | // id, newState, m_mod.Scene.Name); |
213 | // } | 213 | // } |
214 | } | 214 | } |
@@ -281,7 +281,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
281 | { | 281 | { |
282 | if (!m_mod.WaitForAgentArrivedAtDestination) | 282 | if (!m_mod.WaitForAgentArrivedAtDestination) |
283 | return true; | 283 | return true; |
284 | 284 | ||
285 | lock (m_agentsInTransit) | 285 | lock (m_agentsInTransit) |
286 | { | 286 | { |
287 | AgentTransferState? currentState = GetAgentTransferState(id); | 287 | AgentTransferState? currentState = GetAgentTransferState(id); |