Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-03 21:43:39 +00:00
56 changed files with 1095 additions and 838 deletions

View File

@@ -659,7 +659,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;
lock(m_ScriptErrors)
lock (m_ScriptErrors)
{
try
{