Merge branch 'master' into careminster

This commit is contained in:
Melanie
2009-11-23 04:24:58 +00:00
43 changed files with 994 additions and 123 deletions

View File

@@ -2430,7 +2430,7 @@ namespace OpenSim.Region.Framework.Scenes
m_updateFlag = 0; //Same here
}
}
ClearUpdateSchedule();
m_updateFlag = 0;
}
/// <summary>