diff --git a/doc/contributions.txt b/doc/contributions.txt index 04edfb4bea1a9857e1c875b3ccf4dd84c5d43ba2..a80dbe28395290800d3bacdd72702b8eb4b7ef0d 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -629,6 +629,7 @@ Jonathan Yap STORM-1809 STORM-1793 STORM-1810 + STORM-1872 Kadah Coba STORM-1060 Jondan Lundquist diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 05c05b9393e6ebe87e8a3a2a8f2f3ec458a2926d..bad82f64863e7f415928b3b0640a4be28e8859e6 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10784,7 +10784,8 @@ <string>F32</string> <key>Value</key> <real>0.1</real> - </map> <key>ToolTipFadeTime</key> + </map> + <key>ToolTipFadeTime</key> <map> <key>Comment</key> <string>Seconds over which tooltip fades away</string>