diff options
author | Diva Canto | 2015-11-12 18:31:27 -0800 |
---|---|---|
committer | Diva Canto | 2015-11-12 18:31:27 -0800 |
commit | 3515fda101dfdb2ee01236bed836b6c1c93884b4 (patch) | |
tree | 60b16a108bba3f467612731559d782e3f21f2389 /bin/OpenSimDefaults.ini | |
parent | fix cut points of UTF-8 strings (diff) | |
parent | configuration options relative to last tow commits (diff) | |
download | opensim-SC_OLD-3515fda101dfdb2ee01236bed836b6c1c93884b4.zip opensim-SC_OLD-3515fda101dfdb2ee01236bed836b6c1c93884b4.tar.gz opensim-SC_OLD-3515fda101dfdb2ee01236bed836b6c1c93884b4.tar.bz2 opensim-SC_OLD-3515fda101dfdb2ee01236bed836b6c1c93884b4.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r-- | bin/OpenSimDefaults.ini | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 636069d..9002650 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
@@ -166,12 +166,30 @@ | |||
166 | ; into a restart. | 166 | ; into a restart. |
167 | InworldRestartShutsDown = false | 167 | InworldRestartShutsDown = false |
168 | 168 | ||
169 | ; Use of normalized 55FPS statistics | ||
170 | ; Opensim does not have a frame rate control like other simulators | ||
171 | ; Most parameters that control timing can be configurable region by region | ||
172 | ; To achive closer compatibility with values expected by viewers, scripts and users | ||
173 | ; some parameters are converted to a equivalent per frame value. | ||
174 | ; Adicionaly they are scaled to values they whould have on a system running at a nominal 55 frames per second rate | ||
175 | ; The scale factor it 55 * FrameTime, corresponding to 5 with default configuration | ||
176 | ; You can choose to not apply this scale factor setting Normalized55FPS to false. | ||
177 | ; Normalized55FPS = true | ||
178 | |||
169 | ; The minimum proportion of a second that any particular frame can take to execute. | 179 | ; The minimum proportion of a second that any particular frame can take to execute. |
170 | ; Only change this if you really know what you're doing, and be prepared to change UpdatePhysicsEveryNFrames | 180 | ; Only change this if you really know what you're doing, and be prepared to change UpdatePhysicsEveryNFrames |
171 | ; (and other Frames params) to match! For instance, halving MinFrameTime to 0.0445 require | 181 | ; (and other Frames params) to match! For instance, halving MinFrameTime to 0.0445 require |
172 | ; UpdatePhysicsEveryNFrames = 2 unless you don't mind your avatar walking like Benny Hill. | 182 | ; UpdatePhysicsEveryNFrames = 2 unless you don't mind your avatar walking like Benny Hill. |
173 | MinFrameTime = 0.089 | 183 | MinFrameTime = 0.089 |
174 | 184 | ||
185 | ; The values below represent the percentage of the target frame time that, | ||
186 | ; when underrun, should trigger yellow or red in the lag meter. | ||
187 | ; Less than 60% of FPS is amber by default, less then 40% is red. | ||
188 | ; These values are advisory. Viewers may choose to not use them but it is | ||
189 | ; encouraged that they do. | ||
190 | ; FrameTimeWarnPercent = 60; | ||
191 | ; FrameTimeCritPercent = 40; | ||
192 | |||
175 | ; Send scheduled updates to objects in the scene | 193 | ; Send scheduled updates to objects in the scene |
176 | ; This must be a whole number | 194 | ; This must be a whole number |
177 | UpdateObjectsEveryNFrames = 1; | 195 | UpdateObjectsEveryNFrames = 1; |