From 265336463d9e6316c881e8d3d355dc4ac46d3385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Liru=20F=C3=A6rs?= Date: Sat, 11 Jan 2020 04:32:42 -0500 Subject: [PATCH] Add FMOD Logo to login screen to comply with licensing Adds code to hide the new UI when compiled without FMOD Studio --- indra/newview/CMakeLists.txt | 1 + indra/newview/llpanellogin.cpp | 4 ++++ .../newview/skins/default/textures/FMOD Logo.png | Bin 0 -> 8803 bytes .../newview/skins/default/textures/textures.xml | 2 ++ .../skins/default/xui/en-us/panel_login.xml | 2 ++ .../skins/frenchtouch/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../newview/skins/italia/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/kirstenLite2/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../newview/skins/kliteat/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/new_silver/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/orangelife/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/secondlove/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../newview/skins/silver/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/snowwhite/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/stpatrick/textures/FMOD Logo.png | Bin 0 -> 9688 bytes .../skins/white_emerald/textures/FMOD Logo.png | Bin 0 -> 9688 bytes 16 files changed, 9 insertions(+) create mode 100644 indra/newview/skins/default/textures/FMOD Logo.png create mode 100644 indra/newview/skins/frenchtouch/textures/FMOD Logo.png create mode 100644 indra/newview/skins/italia/textures/FMOD Logo.png create mode 100644 indra/newview/skins/kirstenLite2/textures/FMOD Logo.png create mode 100644 indra/newview/skins/kliteat/textures/FMOD Logo.png create mode 100644 indra/newview/skins/new_silver/textures/FMOD Logo.png create mode 100644 indra/newview/skins/orangelife/textures/FMOD Logo.png create mode 100644 indra/newview/skins/secondlove/textures/FMOD Logo.png create mode 100644 indra/newview/skins/silver/textures/FMOD Logo.png create mode 100644 indra/newview/skins/snowwhite/textures/FMOD Logo.png create mode 100644 indra/newview/skins/stpatrick/textures/FMOD Logo.png create mode 100644 indra/newview/skins/white_emerald/textures/FMOD Logo.png diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 54c9329b5..72e6e6432 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1433,6 +1433,7 @@ endif (OPENAL) if (USE_FMODSTUDIO) list(APPEND LLSTARTUP_COMPILE_DEFINITIONS "LL_FMODSTUDIO=1") + set_source_files_properties(llpanellogin.cpp PROPERTIES COMPILE_DEFINITIONS "LL_FMODSTUDIO=1") endif (USE_FMODSTUDIO) set_source_files_properties(llstartup.cpp PROPERTIES COMPILE_DEFINITIONS "${LLSTARTUP_COMPILE_DEFINITIONS}") diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index bafedd9f3..31756e8ca 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -237,6 +237,10 @@ LLPanelLogin::LLPanelLogin(const LLRect& rect) reshape(rect.getWidth(), rect.getHeight()); +#ifndef LL_FMODSTUDIO + getChildView("fmod_logo")->setVisible(false); +#endif + LLComboBox* username_combo(getChild("username_combo")); username_combo->setCommitCallback(boost::bind(LLPanelLogin::onSelectLoginEntry, _2)); username_combo->setFocusLostCallback(boost::bind(&LLPanelLogin::onLoginComboLostFocus, this, username_combo)); diff --git a/indra/newview/skins/default/textures/FMOD Logo.png b/indra/newview/skins/default/textures/FMOD Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0675b5d13dda17d89b20189a9bfef2bcb9fa9c54 GIT binary patch literal 8803 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 P_ujf%V9g43$Cv*P29?9R literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 6e7f64881..064391d9f 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -57,6 +57,8 @@ with the same filename but different name + + diff --git a/indra/newview/skins/default/xui/en-us/panel_login.xml b/indra/newview/skins/default/xui/en-us/panel_login.xml index 9a490a516..acaff50f6 100644 --- a/indra/newview/skins/default/xui/en-us/panel_login.xml +++ b/indra/newview/skins/default/xui/en-us/panel_login.xml @@ -80,6 +80,8 @@