aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2016-08-31 14:36:07 +0100
committerUbitUmarov2016-08-31 14:36:07 +0100
commit2a0df340878db658beddd9f18083c7cdcdcf6500 (patch)
tree85a7fa2a45379299874627f8c2237b1157dc8138 /OpenSim/Region
parentXengine: put back a newline on scripts preamble, and the ugly filename prefix... (diff)
downloadopensim-SC-2a0df340878db658beddd9f18083c7cdcdcf6500.zip
opensim-SC-2a0df340878db658beddd9f18083c7cdcdcf6500.tar.gz
opensim-SC-2a0df340878db658beddd9f18083c7cdcdcf6500.tar.bz2
opensim-SC-2a0df340878db658beddd9f18083c7cdcdcf6500.tar.xz
Xengine: and fix line count again
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs2
2 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index be1aae0..bc6ce4f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -169,18 +169,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
169 169
170 170
171 // standard preamble 171 // standard preamble
172 //retstr = GenerateLine("using OpenSim.Region.ScriptEngine.Common;"); 172
173 //retstr += GenerateLine("using System.Collections.Generic;"); 173
174 //retstr += GenerateLine(""); 174
175 //retstr += GenerateLine("namespace SecondLife");
176 //retstr += GenerateLine("{");
177 m_braceCount++; 175 m_braceCount++;
178 //retstr += GenerateIndentedLine("public class Script : OpenSim.Region.ScriptEngine.Common");
179 //retstr += GenerateIndentedLine("{");
180 m_braceCount++; 176 m_braceCount++;
181 177
182 // line number 178 // line number
183 m_CSharpLine += 9; 179 m_CSharpLine += 10;
184 180
185 // here's the payload 181 // here's the payload
186 sb.Append("\n"); 182 sb.Append("\n");
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 67762a3..f632cb0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -456,7 +456,7 @@ namespace SecondLife
456 456
457 public static void AddCSScriptTail(StringBuilder sb) 457 public static void AddCSScriptTail(StringBuilder sb)
458 { 458 {
459 sb.Append(string.Format("\n }}\n}}\n")); 459 sb.Append(string.Format(" }}\n}}\n"));
460 } 460 }
461 461
462 public static string CreateCSCompilerScript( 462 public static string CreateCSCompilerScript(