From cf284efcda246b8b615bd0eb4e799fe13a29a94b Mon Sep 17 00:00:00 2001 From: Charles Krinke Date: Sun, 10 Feb 2008 16:03:58 +0000 Subject: Thank you very much, Hashbox for : Add scene-debug command to Enable/Disable scripting, collision, and physics from console. --- OpenSim/Region/Application/OpenSimMain.cs | 13 +++++++++++++ OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 +- .../ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 2328c49..6fd479c 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -678,6 +678,18 @@ namespace OpenSim } break; + case "scene-debug": + if (cmdparams.Length == 3) { + if (m_sceneManager.CurrentScene == null) { + m_console.Error("CONSOLE", "Please use 'change-region ' first"); + } else { + m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2])); + } + } else { + m_console.Error("scene-debug (where inside <> is true/false)"); + } + break; + case "help": m_console.Notice("alert - send alert to a designated user or all users."); m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); @@ -689,6 +701,7 @@ namespace OpenSim m_console.Notice("command-script [filename] - Execute command in a file."); m_console.Notice("debug - debugging commands"); m_console.Notice(" packet 0..255 - print incoming/outgoing packets (0=off)"); + m_console.Notice("scene-debug [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False"); m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim"); m_console.Notice("export-map [filename] - save image of world map"); m_console.Notice("force-update - force an update of prims in the scene"); diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 6540c89..36aae31 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs @@ -2189,7 +2189,7 @@ namespace OpenSim.Region.ScriptEngine.Common //return ret; NotImplemented("llListRandomize"); - return new LSL_Types.list(); + return src; } public LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride) diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index d44b141..5c8b4b5 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -126,12 +126,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL string strlan = strl.Trim(" \t".ToCharArray()).ToLower(); if (!LanguageMapping.ContainsKey(strlan)) { - m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Config error. Compiler is unable to recongnize language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); + m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Config error. Compiler is unable to recognize language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); } else { #if DEBUG - m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Config OK. Compiler recongnized language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); + m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Config OK. Compiler recognized language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); #endif } AllowedCompilers.Add(strlan, true); @@ -420,4 +420,4 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL return OutFile; } } -} \ No newline at end of file +} -- cgit v1.1