diff options
| author | Melanie Thielker | 2014-06-21 00:23:11 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:23:11 +0200 |
| commit | 527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b (patch) | |
| tree | f54e3addc4cffaab23df8fee98e8e466023ddab3 /OpenSim/Region/ScriptEngine/XEngine | |
| parent | Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e' (diff) | |
| parent | BulletSim: create axis lock constraint with proper orientation and (diff) | |
| download | opensim-SC-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.zip opensim-SC-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.tar.gz opensim-SC-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.tar.bz2 opensim-SC-527c2cdb1ed981eb0ebb7a3c45b5c06761a4630b.tar.xz | |
Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76'
Diffstat (limited to 'OpenSim/Region/ScriptEngine/XEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs index 04a4e53..61985e8 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||
| @@ -609,7 +609,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 609 | if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene)) | 609 | if (!(MainConsole.Instance.ConsoleScene == null || MainConsole.Instance.ConsoleScene == m_Scene)) |
| 610 | return; | 610 | return; |
| 611 | 611 | ||
| 612 | MainConsole.Instance.OutputFormat(GetStatusReport()); | 612 | MainConsole.Instance.Output(GetStatusReport()); |
| 613 | } | 613 | } |
| 614 | 614 | ||
| 615 | public string GetStatusReport() | 615 | public string GetStatusReport() |
| @@ -708,7 +708,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 708 | sb.AppendFormat("Containing part UUID: {0}\n", instance.ObjectID); | 708 | sb.AppendFormat("Containing part UUID: {0}\n", instance.ObjectID); |
| 709 | sb.AppendFormat("Position : {0}\n", sop.AbsolutePosition); | 709 | sb.AppendFormat("Position : {0}\n", sop.AbsolutePosition); |
| 710 | 710 | ||
| 711 | MainConsole.Instance.OutputFormat(sb.ToString()); | 711 | MainConsole.Instance.Output(sb.ToString()); |
| 712 | } | 712 | } |
| 713 | 713 | ||
| 714 | private void HandleSuspendScript(IScriptInstance instance) | 714 | private void HandleSuspendScript(IScriptInstance instance) |