diff options
author | Jeff Ames | 2009-06-09 18:07:35 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-09 18:07:35 +0000 |
commit | a7fcacf8f396acbca0b640a65acfbf5487d513e7 (patch) | |
tree | 5ba66f5c83eceeb81e24a0540ae4fac9847e0c78 /OpenSim/Region/ScriptEngine | |
parent | Update svn properties. (diff) | |
download | opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.zip opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.gz opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.bz2 opensim-SC-a7fcacf8f396acbca0b640a65acfbf5487d513e7.tar.xz |
Formatting cleanup. Ignore some generated files.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs index 911da5b..5c7ce43 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs | |||
@@ -342,13 +342,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
342 | throw new Exception(errtext); | 342 | throw new Exception(errtext); |
343 | } | 343 | } |
344 | 344 | ||
345 | if(m_scriptEngine.World.Permissions.CanCompileScript(ownerUUID, (int)l) == false) { | 345 | if (m_scriptEngine.World.Permissions.CanCompileScript(ownerUUID, (int)l) == false) { |
346 | // Not allowed to compile to this language! | 346 | // Not allowed to compile to this language! |
347 | string errtext = String.Empty; | 347 | string errtext = String.Empty; |
348 | errtext += ownerUUID + " is not in list of allowed users for this scripting language. Script will not be executed!"; | 348 | errtext += ownerUUID + " is not in list of allowed users for this scripting language. Script will not be executed!"; |
349 | throw new Exception(errtext); | 349 | throw new Exception(errtext); |
350 | } | 350 | } |
351 | 351 | ||
352 | string compileScript = Script; | 352 | string compileScript = Script; |
353 | 353 | ||
354 | if (l == enumCompileType.lsl) | 354 | if (l == enumCompileType.lsl) |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs index 5dfbdbc..3ca7f7c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs | |||
@@ -135,8 +135,8 @@ state another_state | |||
135 | [Test] | 135 | [Test] |
136 | public void TestLoneIdent() | 136 | public void TestLoneIdent() |
137 | { | 137 | { |
138 | // A lone ident should be removed completely as it's an error in C# | 138 | // A lone ident should be removed completely as it's an error in C# |
139 | // (MONO at least). | 139 | // (MONO at least). |
140 | string input = @"default | 140 | string input = @"default |
141 | { | 141 | { |
142 | touch_start(integer num_detected) | 142 | touch_start(integer num_detected) |
@@ -150,7 +150,7 @@ state another_state | |||
150 | "\n public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" + | 150 | "\n public void default_event_touch_start(LSL_Types.LSLInteger num_detected)" + |
151 | "\n {" + | 151 | "\n {" + |
152 | "\n LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(0);" + | 152 | "\n LSL_Types.LSLInteger x = new LSL_Types.LSLInteger(0);" + |
153 | "\n ;" + | 153 | "\n ;" + |
154 | "\n }\n"; | 154 | "\n }\n"; |
155 | 155 | ||
156 | CSCodeGenerator cg = new CSCodeGenerator(); | 156 | CSCodeGenerator cg = new CSCodeGenerator(); |