diff options
| author | Richard Linden <none@none> | 2013-05-09 17:19:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-05-09 17:19:05 -0700 |
| commit | 43f063fe2c814e28da69f2f5c373497a6d621460 (patch) | |
| tree | 466e8ec00ac157e6f48303deae19575c0dddab98 /indra/newview/app_settings | |
| parent | f26f0330aa6c8f260626fffee2ad2a8664f4cd1b (diff) | |
SH-4080 WIP interesting: random crash on Mac
added controls for curtain delay
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 94a8550938..8a1c37d242 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -19,7 +19,7 @@ <string> Time before automatically setting AFK (away from keyboard) mode (seconds, 0=never). Valid values are: 0, 120, 300, 600, 1800 -</string> + </string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -14117,5 +14117,27 @@ <key>Value</key> <integer>0</integer> </map> + <key>TeleportArrivalDelay</key> + <map> + <key>Comment</key> + <string>Time to wait before displaying world during teleport (seconds)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>2</real> + </map> + <key>TeleportLocalDelay</key> + <map> + <key>Comment</key> + <string>Delay to prevent teleports after starting an in-sim teleport. (seconds)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>1</real> + </map> </map> </llsd> |