aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs12
1 files changed, 3 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index afa9191..8b0dbaa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -363,15 +363,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
363 part.SetScriptEvents(m_ItemID, 363 part.SetScriptEvents(m_ItemID,
364 (int)m_Script.GetStateEventFlags(State)); 364 (int)m_Script.GetStateEventFlags(State));
365 365
366 if (Running && (!m_ShuttingDown)) 366 Running = false;
367 { 367
368 Running = false; 368 if (m_ShuttingDown)
369 }
370 else
371 {
372 Running = false;
373 m_startOnInit = false; 369 m_startOnInit = false;
374 }
375 370
376 // we get new rez events on sim restart, too 371 // we get new rez events on sim restart, too
377 // but if there is state, then we fire the change 372 // but if there is state, then we fire the change
@@ -380,7 +375,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
380 // We loaded state, don't force a re-save 375 // We loaded state, don't force a re-save
381 m_SaveState = false; 376 m_SaveState = false;
382 m_startedFromSavedState = true; 377 m_startedFromSavedState = true;
383
384 } 378 }
385 } 379 }
386 else 380 else