diff options
Diffstat (limited to 'bin')
-rw-r--r-- | bin/OpenSim.32BitLaunch.exe.config | 10 | ||||
-rwxr-xr-x | bin/OpenSim.exe.config | 10 | ||||
-rw-r--r-- | bin/OpenSim.ini.example | 18 | ||||
-rw-r--r-- | bin/OpenSimDefaults.ini | 14 | ||||
-rw-r--r-- | bin/Robust.32BitLaunch.exe.config | 10 | ||||
-rw-r--r-- | bin/Robust.exe.config | 10 |
6 files changed, 48 insertions, 24 deletions
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 @@ | |||
23 | </layout> | 23 | </layout> |
24 | </appender> | 24 | </appender> |
25 | 25 | ||
26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
26 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
27 | <file value="OpenSim.32BitLaunch.log" /> | 28 | <file value="log/OpenSim.32BitLaunch.log" /> |
28 | <appendToFile value="true" /> | ||
29 | <rollingStyle value="Date" /> | 29 | <rollingStyle value="Date" /> |
30 | <datePattern value="'.'yyyy-MM-dd"/> | 30 | <datePattern value="'.'yyyy-MM-dd"/> |
31 | ... | ||
32 | --> | ||
33 | |||
34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
35 | <file value="OpenSim.32BitLaunch.log" /> | ||
36 | <appendToFile value="true" /> | ||
31 | <filter type="log4net.Filter.LoggerMatchFilter"> | 37 | <filter type="log4net.Filter.LoggerMatchFilter"> |
32 | <loggerToMatch value="special"/> | 38 | <loggerToMatch value="special"/> |
33 | <acceptOnMatch value="false"/> | 39 | <acceptOnMatch value="false"/> |
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 @@ | |||
23 | </layout> | 23 | </layout> |
24 | </appender> | 24 | </appender> |
25 | 25 | ||
26 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
26 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 27 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
27 | <file value="OpenSim.log" /> | 28 | <file value="log/OpenSim.log" /> |
28 | <appendToFile value="true" /> | ||
29 | <rollingStyle value="Date" /> | 29 | <rollingStyle value="Date" /> |
30 | <datePattern value="'.'yyyy-MM-dd"/> | 30 | <datePattern value="'.'yyyy-MM-dd"/> |
31 | ... | ||
32 | --> | ||
33 | |||
34 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
35 | <file value="OpenSim.log" /> | ||
36 | <appendToFile value="true" /> | ||
31 | <filter type="log4net.Filter.LoggerMatchFilter"> | 37 | <filter type="log4net.Filter.LoggerMatchFilter"> |
32 | <loggerToMatch value="special"/> | 38 | <loggerToMatch value="special"/> |
33 | <acceptOnMatch value="false"/> | 39 | <acceptOnMatch value="false"/> |
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index bf5e18c..1395d72 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
@@ -103,36 +103,36 @@ | |||
103 | 103 | ||
104 | ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 | 104 | ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 |
105 | ;; Minimum size for non-physical prims. Affects resizing of existing | 105 | ;; Minimum size for non-physical prims. Affects resizing of existing |
106 | ;; prims. This can be overriden in the region config file (as | 106 | ;; prims. This can be overridden in the region config file (as |
107 | ;; NonPhysicalPrimMin!). | 107 | ;; NonPhysicalPrimMin!). |
108 | ; NonPhysicalPrimMin = 0.001 | 108 | ; NonPhysicalPrimMin = 0.001 |
109 | 109 | ||
110 | ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 | 110 | ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 |
111 | ;; Maximum size for non-physical prims. Affects resizing of existing | 111 | ;; Maximum size for non-physical prims. Affects resizing of existing |
112 | ;; prims. This can be overriden in the region config file (as | 112 | ;; prims. This can be overridden in the region config file (as |
113 | ;; NonPhysicalPrimMax!). | 113 | ;; NonPhysicalPrimMax!). |
114 | ; NonPhysicalPrimMax = 256 | 114 | ; NonPhysicalPrimMax = 256 |
115 | 115 | ||
116 | ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01 | 116 | ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 0.01 |
117 | ;; Maximum size where a prim can be physical. Affects resizing of | 117 | ;; Minimum size where a prim can be physical. Affects resizing of |
118 | ;; existing prims. This can be overriden in the region config file. | 118 | ;; existing prims. This can be overridden in the region config file. |
119 | ; PhysicalPrimMin = 0.01 | 119 | ; PhysicalPrimMin = 0.01 |
120 | 120 | ||
121 | ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 64 | 121 | ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 64 |
122 | ;; Maximum size where a prim can be physical. Affects resizing of | 122 | ;; Maximum size where a prim can be physical. Affects resizing of |
123 | ;; existing prims. This can be overriden in the region config file. | 123 | ;; existing prims. This can be overridden in the region config file. |
124 | ; PhysicalPrimMax = 64 | 124 | ; PhysicalPrimMax = 64 |
125 | 125 | ||
126 | ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false | 126 | ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false |
127 | ;; If a viewer attempts to rez a prim larger than the non-physical or | 127 | ;; If a viewer attempts to rez a prim larger than the non-physical or |
128 | ;; physical prim max, clamp the dimensions to the appropriate maximum | 128 | ;; physical prim max, clamp the dimensions to the appropriate maximum |
129 | ;; This can be overriden in the region config file. | 129 | ;; This can be overridden in the region config file. |
130 | ; ClampPrimSize = false | 130 | ; ClampPrimSize = false |
131 | 131 | ||
132 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 | 132 | ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 |
133 | ;; Maximum number of prims allowable in a linkset. Affects creating new | 133 | ;; Maximum number of prims allowable in a linkset. Affects creating new |
134 | ;; linksets. Ignored if less than or equal to zero. | 134 | ;; linksets. Ignored if less than or equal to zero. |
135 | ;; This can be overriden in the region config file. | 135 | ;; This can be overridden in the region config file. |
136 | ; LinksetPrims = 0 | 136 | ; LinksetPrims = 0 |
137 | 137 | ||
138 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true | 138 | ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true |
@@ -278,7 +278,7 @@ | |||
278 | ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true | 278 | ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true |
279 | ;; Map tile options. | 279 | ;; Map tile options. |
280 | ;; If true, then maptiles are generated using the MapImageModule below. | 280 | ;; If true, then maptiles are generated using the MapImageModule below. |
281 | ;; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overriden | 281 | ;; If false then the texture referenced by MaptileStaticUUID is used instead, which can also be overridden |
282 | ;; in individual region config file(s). If you do not want to upload map tiles at all, then you will need | 282 | ;; in individual region config file(s). If you do not want to upload map tiles at all, then you will need |
283 | ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/ | 283 | ;; both to set this to false and comment out the [Modules] MapImageServiceModule setting in config-include/ |
284 | ; GenerateMaptiles = true | 284 | ; GenerateMaptiles = true |
@@ -827,7 +827,7 @@ | |||
827 | 827 | ||
828 | ;# {AllowedCompilers} {Enabled:true} {Languages to allow (comma separated)?} {} lsl | 828 | ;# {AllowedCompilers} {Enabled:true} {Languages to allow (comma separated)?} {} lsl |
829 | ;; List of allowed languages (lsl,vb,cs) | 829 | ;; List of allowed languages (lsl,vb,cs) |
830 | ;; AllowedCompilers=lsl,cs,js,vb. | 830 | ;; AllowedCompilers=lsl,cs,vb |
831 | ;; *warning*, non lsl languages have access to static methods such as | 831 | ;; *warning*, non lsl languages have access to static methods such as |
832 | ;; System.IO.File. Enable at your own risk. | 832 | ;; System.IO.File. Enable at your own risk. |
833 | ; AllowedCompilers = "lsl" | 833 | ; AllowedCompilers = "lsl" |
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 @@ | |||
99 | ; Increasing this number will increase memory usage. | 99 | ; Increasing this number will increase memory usage. |
100 | MaxPrimUndos = 20 | 100 | MaxPrimUndos = 20 |
101 | 101 | ||
102 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMax!). | 102 | ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overridden in the region config file (as NonPhysicalPrimMax!). |
103 | NonPhysicalPrimMax = 256 | 103 | NonPhysicalPrimMax = 256 |
104 | 104 | ||
105 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overriden in the region config file. | 105 | ; Maximum size of physical prims. Affects resizing of existing prims. This can be overridden in the region config file. |
106 | PhysicalPrimMax = 64 | 106 | PhysicalPrimMax = 64 |
107 | 107 | ||
108 | ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum | 108 | ; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum |
109 | ; This can be overriden in the region config file. | 109 | ; This can be overridden in the region config file. |
110 | ClampPrimSize = false | 110 | ClampPrimSize = false |
111 | 111 | ||
112 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. | 112 | ; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. |
113 | ; This can be overriden in the region config file. | 113 | ; This can be overridden in the region config file. |
114 | LinksetPrims = 0 | 114 | LinksetPrims = 0 |
115 | 115 | ||
116 | ; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. | 116 | ; 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 @@ | |||
522 | enable_adaptive_throttles = true | 522 | enable_adaptive_throttles = true |
523 | 523 | ||
524 | ; Per-client bytes per second rates for the various throttle categories. | 524 | ; Per-client bytes per second rates for the various throttle categories. |
525 | ; These are default values that will be overriden by clients. These | 525 | ; These are default values that will be overridden by clients. These |
526 | ; defaults are approximately equivalent to the throttles set by the Imprudence | 526 | ; defaults are approximately equivalent to the throttles set by the Imprudence |
527 | ; viewer when maximum bandwidth is set to 350kbps | 527 | ; viewer when maximum bandwidth is set to 350kbps |
528 | 528 | ||
@@ -1420,8 +1420,8 @@ | |||
1420 | ; Default language for scripts | 1420 | ; Default language for scripts |
1421 | DefaultCompileLanguage = lsl | 1421 | DefaultCompileLanguage = lsl |
1422 | 1422 | ||
1423 | ; List of allowed languages (lsl,vb,js,cs) | 1423 | ; List of allowed languages (lsl,vb,cs) |
1424 | ; AllowedCompilers=lsl,cs,js,vb. | 1424 | ; AllowedCompilers=lsl,cs,vb |
1425 | ; *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk. | 1425 | ; *warning*, non lsl languages have access to static methods such as System.IO.File. Enable at your own risk. |
1426 | AllowedCompilers=lsl | 1426 | AllowedCompilers=lsl |
1427 | 1427 | ||
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 @@ | |||
21 | </layout> | 21 | </layout> |
22 | </appender> | 22 | </appender> |
23 | 23 | ||
24 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
24 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 25 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
25 | <file value="Robust.32BitLaunch.log" /> | 26 | <file value="log/Robust.32BitLaunch.log" /> |
26 | <appendToFile value="true" /> | ||
27 | <rollingStyle value="Date" /> | 27 | <rollingStyle value="Date" /> |
28 | <datePattern value="'.'yyyy-MM-dd"/> | 28 | <datePattern value="'.'yyyy-MM-dd"/> |
29 | ... | ||
30 | --> | ||
31 | |||
32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
33 | <file value="Robust.32BitLaunch.log" /> | ||
34 | <appendToFile value="true" /> | ||
29 | <filter type="log4net.Filter.LoggerMatchFilter"> | 35 | <filter type="log4net.Filter.LoggerMatchFilter"> |
30 | <loggerToMatch value="special"/> | 36 | <loggerToMatch value="special"/> |
31 | <acceptOnMatch value="false"/> | 37 | <acceptOnMatch value="false"/> |
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 @@ | |||
21 | </layout> | 21 | </layout> |
22 | </appender> | 22 | </appender> |
23 | 23 | ||
24 | <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender: | ||
24 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> | 25 | <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender"> |
25 | <file value="Robust.log" /> | 26 | <file value="log/Robust.log" /> |
26 | <appendToFile value="true" /> | ||
27 | <rollingStyle value="Date" /> | 27 | <rollingStyle value="Date" /> |
28 | <datePattern value="'.'yyyy-MM-dd"/> | 28 | <datePattern value="'.'yyyy-MM-dd"/> |
29 | ... | ||
30 | --> | ||
31 | |||
32 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
33 | <file value="Robust.log" /> | ||
34 | <appendToFile value="true" /> | ||
29 | <filter type="log4net.Filter.LoggerMatchFilter"> | 35 | <filter type="log4net.Filter.LoggerMatchFilter"> |
30 | <loggerToMatch value="special"/> | 36 | <loggerToMatch value="special"/> |
31 | <acceptOnMatch value="false"/> | 37 | <acceptOnMatch value="false"/> |