Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-04-19 15:33:20 +01:00
2 changed files with 30 additions and 33 deletions

View File

@@ -96,7 +96,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
private bool m_startedFromSavedState;
private UUID m_CurrentStateHash;
private UUID m_RegionID;
private bool m_Suspended = true;
private bool m_Suspended = false;
private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
m_LineMap;