From cffea984f141381befed09b0d86f9d36befbbc63 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 26 Mar 2014 00:50:33 +0000 Subject: minor: Remove "js" (Javascript) from list of allowed languages in script config since it hasn't been present in OpenSimulator for a very long time (0.6 days) One reason support was removed is that the external DLL that implemented Javascript stopped development. Not sure how well this ever worked in OpenSimulator. Not removing vb for now as this is directly supported by Mono (via vbnc compiler) though I strongly suspect it is also inoperable. --- bin/OpenSim.ini.example | 2 +- bin/OpenSimDefaults.ini | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bf5e18c..b6fba8b 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -827,7 +827,7 @@ ;# {AllowedCompilers} {Enabled:true} {Languages to allow (comma separated)?} {} lsl ;; List of allowed languages (lsl,vb,cs) - ;; AllowedCompilers=lsl,cs,js,vb. + ;; 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" diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 4f2563c..91fd05d 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini @@ -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 -- cgit v1.1 From 14a7ddb885a284f3e8b61be4f3a0fbc265ea5fbb Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Wed, 26 Mar 2014 08:56:56 +0200 Subject: Revert "Use log-rolling on the log files (once per day)" This reverts commit 8ecab21b379d34f97ac966b13e1605024364142b. --- bin/OpenSim.32BitLaunch.exe.config | 10 ++++++++-- bin/OpenSim.exe.config | 10 ++++++++-- bin/Robust.32BitLaunch.exe.config | 10 ++++++++-- bin/Robust.exe.config | 10 ++++++++-- 4 files changed, 32 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 25776f2..5b7807a 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config @@ -23,11 +23,17 @@ + + + + + diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config index 8b48156..31f1064 100755 --- a/bin/OpenSim.exe.config +++ b/bin/OpenSim.exe.config @@ -23,11 +23,17 @@ + + + + + diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config index 3bae9ec..95061e1 100644 --- a/bin/Robust.32BitLaunch.exe.config +++ b/bin/Robust.32BitLaunch.exe.config @@ -21,11 +21,17 @@ + + + + + diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config index 889a964..b9e01f1 100644 --- a/bin/Robust.exe.config +++ b/bin/Robust.exe.config @@ -21,11 +21,17 @@ + + + + + -- cgit v1.1 From e7fa8a4699034a7387049c74edce128180e9f1d2 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 26 Mar 2014 23:43:49 +0000 Subject: minor: change misspelling of overriden to overridden in comments within config files Thanks to aiaustin for the spot. --- bin/OpenSim.ini.example | 14 +++++++------- bin/OpenSimDefaults.ini | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index b6fba8b..66504c5 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -103,36 +103,36 @@ ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 ;; Minimum size for non-physical prims. Affects resizing of existing - ;; prims. This can be overriden in the region config file (as + ;; prims. This can be overridden in the region config file (as ;; NonPhysicalPrimMin!). ; NonPhysicalPrimMin = 0.001 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 ;; Maximum size for non-physical prims. Affects resizing of existing - ;; prims. This can be overriden in the region config file (as + ;; prims. This can be overridden in the region config file (as ;; NonPhysicalPrimMax!). ; NonPhysicalPrimMax = 256 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01 ;; Maximum size where a prim can be physical. Affects resizing of - ;; existing prims. This can be overriden in the region config file. + ;; existing prims. This can be overridden in the region config file. ; PhysicalPrimMin = 0.01 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 64 ;; Maximum size where a prim can be physical. Affects resizing of - ;; existing prims. This can be overriden in the region config file. + ;; existing prims. This can be overridden in the region config file. ; PhysicalPrimMax = 64 ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false ;; 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 ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 ;; 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 ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true @@ -278,7 +278,7 @@ ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true ;; Map tile options. ;; If true, then maptiles are generated using the MapImageModule below. - ;; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overriden + ;; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overridden ;; in individual region config file(s). If you do not want to upload map tiles at all, then you will need ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/ ; GenerateMaptiles = true diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 91fd05d..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 -- cgit v1.1 From af54e6f370dc03ffafc7540e3aac9979ae0f85ce Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 26 Mar 2014 23:45:02 +0000 Subject: minor: Change incorrect "Maximum" in the PhysicalPrimMin OpenSim.ini.example description to "Minimum" Thanks to aiaustin for the spot. --- bin/OpenSim.ini.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 66504c5..1395d72 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example @@ -114,7 +114,7 @@ ; NonPhysicalPrimMax = 256 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01 - ;; Maximum size where a prim can be physical. Affects resizing of + ;; Minimum size where a prim can be physical. Affects resizing of ;; existing prims. This can be overridden in the region config file. ; PhysicalPrimMin = 0.01 -- cgit v1.1