summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-10-27 11:10:31 -0400
committerOz Linden <oz@lindenlab.com>2015-10-27 11:10:31 -0400
commit9f47b4fd163d0e2d471d94e4d95873be66e80261 (patch)
tree3b8ae8dff980d2c25f7429471e9d2b777bf7479b /indra/newview/skins/default
parent54f39f86d205bdf52cd40fc0c4fcdd17ec694bb7 (diff)
parentb059b82caadc5ab8348cd3a7e9892367e625ab27 (diff)
merge fix for BUG-7387
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_fast_timers.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_fast_timers.xml b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
index 5d83ad6bea..fa7147d9ca 100755
--- a/indra/newview/skins/default/xui/en/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/en/floater_fast_timers.xml
@@ -25,7 +25,7 @@
<item name="2x Average" label="2x Average"/>
<item name="Max" label="Max"/>
<item name="Recent Max" label="Recent Max"/>
- <item nme="100ms" label="100ms"/>
+ <item name="100ms" label="100ms"/>
</combo_box>
<combo_box name="metric_combo"
follows="left|top"