diff options
author | Dr Scofield | 2009-03-25 07:36:56 +0000 |
---|---|---|
committer | Dr Scofield | 2009-03-25 07:36:56 +0000 |
commit | 0bb3d2e6d75baa244da1906e0466448cf4acb3be (patch) | |
tree | 324b6234d789311048899f0044756889cad39f23 /OpenSim/Region | |
parent | HGStandaloneInventoryService now serves inventory assets. No need for clients... (diff) | |
download | opensim-SC-0bb3d2e6d75baa244da1906e0466448cf4acb3be.zip opensim-SC-0bb3d2e6d75baa244da1906e0466448cf4acb3be.tar.gz opensim-SC-0bb3d2e6d75baa244da1906e0466448cf4acb3be.tar.bz2 opensim-SC-0bb3d2e6d75baa244da1906e0466448cf4acb3be.tar.xz |
cleanup
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs index 5ceab0a..2ca1bce 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/ScriptManager.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine | |||
69 | #region Declares | 69 | #region Declares |
70 | 70 | ||
71 | private Thread scriptLoadUnloadThread; | 71 | private Thread scriptLoadUnloadThread; |
72 | private static Thread staticScriptLoadUnloadThread; | 72 | private static Thread staticScriptLoadUnloadThread = null; |
73 | private Queue<LUStruct> LUQueue = new Queue<LUStruct>(); | 73 | private Queue<LUStruct> LUQueue = new Queue<LUStruct>(); |
74 | private static bool PrivateThread; | 74 | private static bool PrivateThread; |
75 | private int LoadUnloadMaxQueueSize; | 75 | private int LoadUnloadMaxQueueSize; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs index bb85508..202ce7a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/lsl.lexer.cs | |||
@@ -18528,7 +18528,6 @@ public override TOKEN OldAction(Lexer yym,ref string yytext,int action, ref bool | |||
18528 | case 989: { ((LSLTokens)yym).str += '\\'; } | 18528 | case 989: { ((LSLTokens)yym).str += '\\'; } |
18529 | break; | 18529 | break; |
18530 | case 994: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } | 18530 | case 994: { yym.yy_begin("YYINITIAL"); ((LSLTokens)yym).yytext = ((LSLTokens)yym).str; ((LSLTokens)yym).str = String.Empty; return new STRING_CONSTANT(yym); } |
18531 | break; | ||
18532 | case 999: { yym.yy_begin("COMMENT"); } | 18531 | case 999: { yym.yy_begin("COMMENT"); } |
18533 | break; | 18532 | break; |
18534 | } | 18533 | } |