aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-04-19 14:14:31 +0100
committerMelanie2010-04-19 14:14:31 +0100
commita89208b465ff935d769ecac70c7697d273ddb406 (patch)
treef5bb09d1d41e2bbfaafe629a38f630ee9ece3e0a /OpenSim
parentAnd some more rez modes that weren't covered before (diff)
downloadopensim-SC-a89208b465ff935d769ecac70c7697d273ddb406.zip
opensim-SC-a89208b465ff935d769ecac70c7697d273ddb406.tar.gz
opensim-SC-a89208b465ff935d769ecac70c7697d273ddb406.tar.bz2
opensim-SC-a89208b465ff935d769ecac70c7697d273ddb406.tar.xz
Stopgap measure. Disable the recent script startup changes until I can cure the
race condition.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 74f25aa..3dd381d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
95 private bool m_startedFromSavedState; 95 private bool m_startedFromSavedState;
96 private UUID m_CurrentStateHash; 96 private UUID m_CurrentStateHash;
97 private UUID m_RegionID; 97 private UUID m_RegionID;
98 private bool m_Suspended = true; 98 private bool m_Suspended = false;
99 99
100 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> 100 private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
101 m_LineMap; 101 m_LineMap;