Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-08-13 22:53:47 +01:00
15 changed files with 246 additions and 42 deletions

View File

@@ -533,7 +533,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
m_log.Warn(
string.Format(
"[SCRIPT INSTANCE]: Could not delete script state {0} for script {1} (id {2}) in part {3} (id {4}) in object {5} in {6}. Exception ",
ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name),
savedState, ScriptTask.Name, ScriptTask.ItemID, Part.Name, Part.UUID, Part.ParentGroup.Name, Engine.World.Name),
e);
}
}