diff options
author | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2016-05-19 11:00:03 -0700 |
commit | 9c4ed8d1138de86041b740139c4deec1bc6bf8ee (patch) | |
tree | d7452bc7faeae01964f13faaa16e2812b27ba93c /indra/newview/skins/default/xui/tr/floater_fast_timers.xml | |
parent | e6fb7564b02ba73c8a402efaca65cb944ce7bef2 (diff) | |
parent | c2ef3b4c7186dbbd95b16520f281b7d58364fb52 (diff) |
Automated merge with tip of viewer-release to pick up 4.0.5
Diffstat (limited to 'indra/newview/skins/default/xui/tr/floater_fast_timers.xml')
-rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/xui/tr/floater_fast_timers.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml index 5736bda45e..5d18767143 100755..100644 --- a/indra/newview/skins/default/xui/tr/floater_fast_timers.xml +++ b/indra/newview/skins/default/xui/tr/floater_fast_timers.xml @@ -6,5 +6,16 @@ <string name="run"> Koş </string> + <combo_box name="time_scale_combo"> + <item label="Ortalamanın 2 katı" name="2x Average"/> + <item label="Maks." name="Max"/> + <item label="En Güncel Maks." name="Recent Max"/> + <item label="100ms" name="100ms"/> + </combo_box> + <combo_box name="metric_combo"> + <item label="Süre" name="Time"/> + <item label="Arama Sayısı" name="Number of Calls"/> + <item label="Hz" name="Hz"/> + </combo_box> <button label="Duraklat" name="pause_btn"/> </floater> |