Merge branch 'master' into httptests

2 files changed, 0 insertions, 19 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f1dcbd3..0ef6cfc 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -965,17 +965,6 @@
     ;; it is more usefull if there are no previously compiled scripts DLLs (as with DeleteScriptsOnStartup = true)
     ;CompactMemOnLoad = false
     
-    ;# {DefaultCompileLanguage} {Enabled:true} {Default script language?} {lsl vb cs} lsl
-    ;; Default language for scripts
-    ; DefaultCompileLanguage = "lsl"
-
-    ;# {AllowedCompilers} {Enabled:true} {Languages to allow (comma separated)?} {} lsl
-    ;; List of allowed languages (lsl,vb,cs)
-    ;; AllowedCompilers=lsl,cs,vb
-    ;; *warning*, non lsl languages have access to static methods such as
-    ;; System.IO.File.  Enable at your own risk.
-    ; AllowedCompilers = "lsl"
-
     ;; Compile debug info (line numbers) into the script assemblies
     ; CompileWithDebugInformation = true
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f7e2f5f..bbea8c7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1792,14 +1792,6 @@
     ; Save the source of all compiled scripts
     WriteScriptSourceToDebugFile = false
 
-    ; Default language for scripts
-    DefaultCompileLanguage = lsl
-
-    ; List of allowed languages (lsl,vb,cs)
-    ; AllowedCompilers=lsl,cs,vb
-    ; *warning*, non lsl languages have access to static methods such as System.IO.File.  Enable at your own risk.
-    AllowedCompilers=lsl
-
     ; Compile debug info (line numbers) into the script assemblies
     CompileWithDebugInformation = true