diff options
| author | Melanie | 2010-04-19 15:33:20 +0100 |
|---|---|---|
| committer | Melanie | 2010-04-19 15:33:20 +0100 |
| commit | d2e4f2d376ae8b2cfc904e304e590f1fd229c906 (patch) | |
| tree | d86654b51d6d15fbc001b3fba6f1d576a5d6993a /OpenSim/Region/ScriptEngine | |
| parent | And some more rez modes that weren't covered before (diff) | |
| parent | Make script asset fetches synchronous. Script instantiation synchronization (diff) | |
| download | opensim-SC_OLD-d2e4f2d376ae8b2cfc904e304e590f1fd229c906.zip opensim-SC_OLD-d2e4f2d376ae8b2cfc904e304e590f1fd229c906.tar.gz opensim-SC_OLD-d2e4f2d376ae8b2cfc904e304e590f1fd229c906.tar.bz2 opensim-SC_OLD-d2e4f2d376ae8b2cfc904e304e590f1fd229c906.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
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 9ccc199..b348403 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -96,7 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 96 | private bool m_startedFromSavedState; | 96 | private bool m_startedFromSavedState; |
| 97 | private UUID m_CurrentStateHash; | 97 | private UUID m_CurrentStateHash; |
| 98 | private UUID m_RegionID; | 98 | private UUID m_RegionID; |
| 99 | private bool m_Suspended = true; | 99 | private bool m_Suspended = false; |
| 100 | 100 | ||
| 101 | private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> | 101 | private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> |
| 102 | m_LineMap; | 102 | m_LineMap; |