Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'

This commit is contained in:
Melanie Thielker
2014-06-21 00:23:11 +02:00
10 changed files with 42 additions and 27 deletions

View File

@@ -609,7 +609,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene))
return;
MainConsole.Instance.OutputFormat(GetStatusReport());
MainConsole.Instance.Output(GetStatusReport());
}
public string GetStatusReport()
@@ -708,7 +708,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
sb.AppendFormat("Containing part UUID: {0}\n", instance.ObjectID);
sb.AppendFormat("Position : {0}\n", sop.AbsolutePosition);
MainConsole.Instance.OutputFormat(sb.ToString());
MainConsole.Instance.Output(sb.ToString());
}
private void HandleSuspendScript(IScriptInstance instance)