summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings/settings.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-06-08 09:00:05 -0400
committerOz Linden <oz@lindenlab.com>2012-06-08 09:00:05 -0400
commit3ebfcd70542b29bd709fc08860eb06f211e2fa6a (patch)
tree789a90952e63ea8f9ef508ecbee878f766b5d851 /indra/newview/app_settings/settings.xml
parented15f056b1dc39498cff0913ab6b7d2b90b7e1ed (diff)
parent408987515462ceb60260f39efcbdd0dd163a5971 (diff)
merge changes for DRTVWR-163
Diffstat (limited to 'indra/newview/app_settings/settings.xml')
-rw-r--r--indra/newview/app_settings/settings.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c9b4de0140..f874df5cb4 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10863,7 +10863,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>