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/panel_prim_media_controls.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/panel_prim_media_controls.xml')
-rw-r--r--[-rwxr-xr-x] | indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml index 0433d03450..5d54c1771c 100755..100644 --- a/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml +++ b/indra/newview/skins/default/xui/tr/panel_prim_media_controls.xml @@ -57,12 +57,9 @@ <layout_panel name="media_address"> <line_editor name="media_address_url" tool_tip="Ortam URL'si"/> <layout_stack name="media_address_url_icons"> - <layout_panel> + <layout_panel name="media_address_url_icons_wl"> <icon name="media_whitelist_flag" tool_tip="Beyaz Liste etkin"/> </layout_panel> - <layout_panel> - <icon name="media_secure_lock_flag" tool_tip="Güvenli Tarama"/> - </layout_panel> </layout_stack> </layout_panel> <layout_panel name="media_play_position"> |