diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-12-18 10:44:42 -0500 |
| commit | 4b7ff25eba4b285e267ec6f766221ffcde82a808 (patch) | |
| tree | e8a885c7167046bec9311981a7f690a190248b2a /indra/newview/skins/default/xui/en/panel_preferences_setup.xml | |
| parent | d3b4f34eb7ff80315f1d714aa50bc7d7d33f9855 (diff) | |
| parent | 7b993d15b70d419dc0a7c8d92286d34a2635537d (diff) | |
merge changes for 4.0.0-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_setup.xml')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index be88ef9b3d..0b605cf6f7 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -224,19 +224,6 @@ radio_style="false" width="400" top_pad="5"/> - <check_box - top_delta="4" - enabled="true" - follows="left|top" - height="14" - initial_value="false" - control_name="MediaEnablePopups" - label="Enable media browser pop-ups" - left_delta="0" - mouse_opaque="true" - name="media_popup_enabled" - width="400" - top_pad="5"/> <text type="string" length="1" |