diff options
author | Charles Krinke | 2008-02-10 16:03:58 +0000 |
---|---|---|
committer | Charles Krinke | 2008-02-10 16:03:58 +0000 |
commit | cf284efcda246b8b615bd0eb4e799fe13a29a94b (patch) | |
tree | cae5c9c917dab29170dc19ee5d7784df05db7828 /OpenSim/Region/ScriptEngine | |
parent | * Refactored permissions handling to extract info out of permisisons block in... (diff) | |
download | opensim-SC-cf284efcda246b8b615bd0eb4e799fe13a29a94b.zip opensim-SC-cf284efcda246b8b615bd0eb4e799fe13a29a94b.tar.gz opensim-SC-cf284efcda246b8b615bd0eb4e799fe13a29a94b.tar.bz2 opensim-SC-cf284efcda246b8b615bd0eb4e799fe13a29a94b.tar.xz |
Thank you very much, Hashbox for :
Add scene-debug command to Enable/Disable scripting,
collision, and physics from console.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs | 6 |
2 files changed, 4 insertions, 4 deletions
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 | } |