Merge branch 'master' into m_test

1 files changed, 7 insertions, 7 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 4f2563c..fca0b49 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -99,18 +99,18 @@
     ; Increasing this number will increase memory usage.
     MaxPrimUndos = 20
 
-    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file (as NonPhysicalPrimMax!).
+    ; Maximum size of non physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file (as NonPhysicalPrimMax!).
     NonPhysicalPrimMax = 256
 
-    ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overriden in the region config file.
+    ; Maximum size of physical prims.  Affects resizing of existing prims.  This can be overridden in the region config file.
     PhysicalPrimMax = 64
 
     ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum
-    ; This can be overriden in the region config file.
+    ; This can be overridden in the region config file.
     ClampPrimSize = false
         
     ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero.
-    ; This can be overriden in the region config file.
+    ; This can be overridden in the region config file.
     LinksetPrims = 0
 
     ; Allow scripts to keep running when they cross region boundaries, rather than being restarted.  State is reloaded on the destination region.
@@ -522,7 +522,7 @@
     enable_adaptive_throttles = true
 
     ; Per-client bytes per second rates for the various throttle categories.
-    ; These are default values that will be overriden by clients. These
+    ; These are default values that will be overridden by clients. These
     ; defaults are approximately equivalent to the throttles set by the Imprudence
     ; viewer when maximum bandwidth is set to 350kbps
 
@@ -1420,8 +1420,8 @@
     ; Default language for scripts
     DefaultCompileLanguage = lsl
 
-    ; List of allowed languages (lsl,vb,js,cs)
-    ; AllowedCompilers=lsl,cs,js,vb.
+    ; 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