diff options
author | UbitUmarov | 2017-06-02 12:58:04 +0100 |
---|---|---|
committer | UbitUmarov | 2017-06-02 12:58:04 +0100 |
commit | 7310b7625e96f2d96c93c40eab1367ed745d9b0d (patch) | |
tree | 9cf62c2d6e3cbd03d6732a049805c5e0b58a1d0a | |
parent | avoi null refs on tests simple clients (diff) | |
download | opensim-SC_OLD-7310b7625e96f2d96c93c40eab1367ed745d9b0d.zip opensim-SC_OLD-7310b7625e96f2d96c93c40eab1367ed745d9b0d.tar.gz opensim-SC_OLD-7310b7625e96f2d96c93c40eab1367ed745d9b0d.tar.bz2 opensim-SC_OLD-7310b7625e96f2d96c93c40eab1367ed745d9b0d.tar.xz |
move a execution overlap guard to end of job
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 439f79d..826cda1 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2120,7 +2120,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
2120 | lock (m_returns) | 2120 | lock (m_returns) |
2121 | { | 2121 | { |
2122 | EventManager.TriggerOnBackup(SimulationDataService, forced); | 2122 | EventManager.TriggerOnBackup(SimulationDataService, forced); |
2123 | m_backingup = false; | ||
2124 | 2123 | ||
2125 | foreach (KeyValuePair<UUID, ReturnInfo> ret in m_returns) | 2124 | foreach (KeyValuePair<UUID, ReturnInfo> ret in m_returns) |
2126 | { | 2125 | { |
@@ -2151,6 +2150,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2151 | tr.SendInstantMessage(msg, delegate(bool success) { }); | 2150 | tr.SendInstantMessage(msg, delegate(bool success) { }); |
2152 | } | 2151 | } |
2153 | m_returns.Clear(); | 2152 | m_returns.Clear(); |
2153 | m_backingup = false; | ||
2154 | } | 2154 | } |
2155 | } | 2155 | } |
2156 | 2156 | ||