summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Yap <none@none>2012-06-04 16:23:16 -0400
committerJonathan Yap <none@none>2012-06-04 16:23:16 -0400
commitc2f0a8ef02d04664bb894eff4b2ca815c3f93d1f (patch)
tree24f153845c080b09997a2eff4099a7a412c1b1e7
parenta519e34f02b4b2663fe082ba9ad12f1b423669cb (diff)
STORM-1872 A line break is missing in ..\app_settings\settings.xml
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/newview/app_settings/settings.xml3
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..a80dbe2839 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 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>