Commit b1e7f294 authored by Rye Mutt's avatar Rye Mutt 🍞
Browse files

Add fmod logo to login screen to comply with license

parent abda5f52
......@@ -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()
......
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
......@@ -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>
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment