aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2016-08-31 10:39:01 +0100
committerUbitUmarov2016-08-31 10:39:01 +0100
commit0f993a12780b74c257ad87063b80a3d8dc258494 (patch)
treed5c35b92ae36f8dc7fa51075427fe110bef0a8b7
parentXengine: forgot to do the indent on map too (diff)
downloadopensim-SC-0f993a12780b74c257ad87063b80a3d8dc258494.zip
opensim-SC-0f993a12780b74c257ad87063b80a3d8dc258494.tar.gz
opensim-SC-0f993a12780b74c257ad87063b80a3d8dc258494.tar.bz2
opensim-SC-0f993a12780b74c257ad87063b80a3d8dc258494.tar.xz
Xengine: also missed a few newlines account
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs6
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
index 0b7f67f..be1aae0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs
@@ -1021,6 +1021,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
1021 private void GenerateLine(StringBuilder sb) 1021 private void GenerateLine(StringBuilder sb)
1022 { 1022 {
1023 sb.Append("\n"); 1023 sb.Append("\n");
1024 m_CSharpLine++;
1025 m_CSharpCol = 1;
1024 } 1026 }
1025 1027
1026 /// <summary> 1028 /// <summary>
@@ -1032,6 +1034,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
1032 { 1034 {
1033 sb.Append(s); 1035 sb.Append(s);
1034 sb.Append("\n"); 1036 sb.Append("\n");
1037 m_CSharpLine++;
1038 m_CSharpCol = 1;
1035 } 1039 }
1036 1040
1037 /// <summary> 1041 /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index 67762a3..b51880d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
109 m_insertCoopTerminationCalls = m_scriptEngine.Config.GetString("ScriptStopStrategy", "abort") == "co-op"; 109 m_insertCoopTerminationCalls = m_scriptEngine.Config.GetString("ScriptStopStrategy", "abort") == "co-op";
110 110
111 // Get file prefix from scriptengine name and make it file system safe: 111 // Get file prefix from scriptengine name and make it file system safe:
112 FilePrefix = "CommonCompiler"; 112 FilePrefix = "";
113 foreach (char c in Path.GetInvalidFileNameChars()) 113 foreach (char c in Path.GetInvalidFileNameChars())
114 { 114 {
115 FilePrefix = FilePrefix.Replace(c, '_'); 115 FilePrefix = FilePrefix.Replace(c, '_');
@@ -441,8 +441,8 @@ namespace SecondLife
441{{ 441{{
442 public class {0} : {1} 442 public class {0} : {1}
443 {{ 443 {{
444 public {0}({2}) : base({3}) {{}} 444 public {0}({2}) : base({3}) {{}}"
445", 445,
446 className, 446 className,
447 baseClassName, 447 baseClassName,
448 constructorParameters != null 448 constructorParameters != null