aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-02-10 16:03:58 +0000
committerCharles Krinke2008-02-10 16:03:58 +0000
commitcf284efcda246b8b615bd0eb4e799fe13a29a94b (patch)
treecae5c9c917dab29170dc19ee5d7784df05db7828
parent* Refactored permissions handling to extract info out of permisisons block in... (diff)
downloadopensim-SC_OLD-cf284efcda246b8b615bd0eb4e799fe13a29a94b.zip
opensim-SC_OLD-cf284efcda246b8b615bd0eb4e799fe13a29a94b.tar.gz
opensim-SC_OLD-cf284efcda246b8b615bd0eb4e799fe13a29a94b.tar.bz2
opensim-SC_OLD-cf284efcda246b8b615bd0eb4e799fe13a29a94b.tar.xz
Thank you very much, Hashbox for :
Add scene-debug command to Enable/Disable scripting, collision, and physics from console.
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs6
3 files changed, 17 insertions, 4 deletions
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
678 } 678 }
679 break; 679 break;
680 680
681 case "scene-debug":
682 if (cmdparams.Length == 3) {
683 if (m_sceneManager.CurrentScene == null) {
684 m_console.Error("CONSOLE", "Please use 'change-region <regioname>' first");
685 } else {
686 m_sceneManager.CurrentScene.SetSceneCoreDebug(!System.Convert.ToBoolean(cmdparams[0]), !System.Convert.ToBoolean(cmdparams[1]), !System.Convert.ToBoolean(cmdparams[2]));
687 }
688 } else {
689 m_console.Error("scene-debug <scripting> <collisions> <physics> (where inside <> is true/false)");
690 }
691 break;
692
681 case "help": 693 case "help":
682 m_console.Notice("alert - send alert to a designated user or all users."); 694 m_console.Notice("alert - send alert to a designated user or all users.");
683 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); 695 m_console.Notice(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
@@ -689,6 +701,7 @@ namespace OpenSim
689 m_console.Notice("command-script [filename] - Execute command in a file."); 701 m_console.Notice("command-script [filename] - Execute command in a file.");
690 m_console.Notice("debug - debugging commands"); 702 m_console.Notice("debug - debugging commands");
691 m_console.Notice(" packet 0..255 - print incoming/outgoing packets (0=off)"); 703 m_console.Notice(" packet 0..255 - print incoming/outgoing packets (0=off)");
704 m_console.Notice("scene-debug [scripting] [collision] [physics] - Enable/Disable debug stuff, each can be True/False");
692 m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim"); 705 m_console.Notice("edit-scale [prim name] [x] [y] [z] - resize given prim");
693 m_console.Notice("export-map [filename] - save image of world map"); 706 m_console.Notice("export-map [filename] - save image of world map");
694 m_console.Notice("force-update - force an update of prims in the scene"); 707 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
2189 2189
2190 //return ret; 2190 //return ret;
2191 NotImplemented("llListRandomize"); 2191 NotImplemented("llListRandomize");
2192 return new LSL_Types.list(); 2192 return src;
2193 } 2193 }
2194 2194
2195 public LSL_Types.list llList2ListStrided(LSL_Types.list src, int start, int end, int stride) 2195 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
126 string strlan = strl.Trim(" \t".ToCharArray()).ToLower(); 126 string strlan = strl.Trim(" \t".ToCharArray()).ToLower();
127 if (!LanguageMapping.ContainsKey(strlan)) 127 if (!LanguageMapping.ContainsKey(strlan))
128 { 128 {
129 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Config error. Compiler is unable to recongnize language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); 129 m_scriptEngine.Log.Error("[" + m_scriptEngine.ScriptEngineName + "]: Config error. Compiler is unable to recognize language type \"" + strlan + "\" specified in \"AllowedCompilers\".");
130 } 130 }
131 else 131 else
132 { 132 {
133#if DEBUG 133#if DEBUG
134 m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Config OK. Compiler recongnized language type \"" + strlan + "\" specified in \"AllowedCompilers\"."); 134 m_scriptEngine.Log.Debug("[" + m_scriptEngine.ScriptEngineName + "]: Config OK. Compiler recognized language type \"" + strlan + "\" specified in \"AllowedCompilers\".");
135#endif 135#endif
136 } 136 }
137 AllowedCompilers.Add(strlan, true); 137 AllowedCompilers.Add(strlan, true);
@@ -420,4 +420,4 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL
420 return OutFile; 420 return OutFile;
421 } 421 }
422 } 422 }
423} \ No newline at end of file 423}