diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-05 10:44:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-05 10:44:02 -0400 |
| commit | a4452eef27276ea1e38f3bdd453eb0514ae2539f (patch) | |
| tree | cc194d970bbb8ac3ada8db6bdda5921c78b469ca /indra/newview | |
| parent | 827622860097b40e77cb53d5770197773cde5191 (diff) | |
| parent | c2f0a8ef02d04664bb894eff4b2ca815c3f93d1f (diff) | |
merge changes for storm-1872
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 05c05b9393..bad82f6486 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> |