From b1e7f29450cb1229e03524af37e02a1b0be1120f Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Feb 2020 16:03:48 -0500
Subject: [PATCH] Add fmod logo to login screen to comply with license
---
indra/newview/llpanellogin.cpp | 7 +++++
.../default/textures/logos/fmod_white.png | Bin 0 -> 2498 bytes
.../skins/default/textures/textures.xml | 1 +
.../skins/default/xui/en/panel_login.xml | 24 +++++++++++++++++-
4 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 indra/newview/skins/default/textures/logos/fmod_white.png
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 4002edad3d..35b541f0f2 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -26,6 +26,8 @@
#include "llviewerprecompiledheaders.h"
+#include "llviewerbuildconfig.h"
+
#include "llpanellogin.h"
#include "lllayoutstack.h"
@@ -190,6 +192,11 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
username_list->setCommitOnSelectionChange(true);
mLoginWidgetStack = getChild<LLLayoutStack>("login_widgets");
+
+#if USE_FMODSTUDIO
+ getChild<LLUICtrl>("fmod_text")->setVisible(TRUE);
+ getChild<LLUICtrl>("fmod_logo")->setVisible(TRUE);
+#endif
}
void LLPanelLogin::addFavoritesToStartLocation()
diff --git a/indra/newview/skins/default/textures/logos/fmod_white.png b/indra/newview/skins/default/textures/logos/fmod_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..47f2e28281080ccd1b5483706fbd56b7abf1931e
GIT binary patch
literal 2498
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
M07*qoM6N<$f~@YPSpWb4
literal 0
HcmV?d00001
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 2ca55da5d3..f8a4aa11c5 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -841,4 +841,5 @@ with the same filename but different name
<texture name="System_Notification" file_name="icons/SL_Logo.png" preload="true"/>
<texture name="Icon_Attachment_Small" file_name="icons/Icon_Attachment_Small.png" preload="true"/>
<texture name="Icon_Attachment_Large" file_name="icons/Icon_Attachment_Large.png" preload="true"/>
+ <texture name="FMOD_White" file_name="logos/fmod_white.png" preload="true"/>
</textures>
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index cf0159ed59..9b5e19dcec 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -217,9 +217,31 @@
tab_stop="false"
follows="right|bottom"
name="links"
- width="210"
+ width="250"
min_width="100"
height="80">
+ <text
+ follows="right|bottom"
+ font="SansSerif"
+ font.style="BOLD"
+ font.size="Large"
+ halign="left"
+ height="16"
+ name="fmod_text"
+ top="8"
+ right="0"
+ width="84"
+ visible="false">
+ Powered By
+ </text>
+ <icon
+ follows="right|bottom"
+ height="38"
+ image_name="FMOD_White"
+ top="33"
+ name="fmod_logo"
+ width="154"
+ visible="false" />
<text
follows="right|bottom"
font="SansSerif"
--
GitLab