diff options
author | Richard Nelson <richard@lindenlab.com> | 2011-10-12 18:17:18 -0700 |
---|---|---|
committer | Richard Nelson <richard@lindenlab.com> | 2011-10-12 18:17:18 -0700 |
commit | 86cbb16e27b63d540d39a3e7342b0c07acabcaee (patch) | |
tree | c1dcc86e8159a66e8ca0becd742075d630bf4a55 /indra/newview/app_settings/settings.xml | |
parent | 40ebe180a6592381804555d1c9e8df84bf35345a (diff) | |
parent | 9206226a377c88d34036ebd8a3ac6d9d55bc4146 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r-- | indra/newview/app_settings/settings.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index dd540654fb..4b847dfbf7 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10905,7 +10905,17 @@ <key>Value</key> <real>0.699999988079</real> </map> - <key>ToolTipFadeTime</key> + <key>ToolTipFastDelay</key> + <map> + <key>Comment</key> + <string>Seconds before displaying tooltip when mouse stops over UI element (when a tooltip is already visible)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>F32</string> + <key>Value</key> + <real>0.1</real> + </map> <key>ToolTipFadeTime</key> <map> <key>Comment</key> <string>Seconds over which tooltip fades away</string> |