diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 4002edad3d29122e226e5069f14478b389258bcb..35b541f0f21720182dc59bb7eb0059eb6fdbc1c5 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 Binary files /dev/null and b/indra/newview/skins/default/textures/logos/fmod_white.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 2ca55da5d3f204b4cd3991bc5b8cba7bad8d023e..f8a4aa11c5ee7c4c8567806729515d1676ca07f2 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 cf0159ed59b56893c7e8812b3a33697973166cc0..9b5e19dcec62fa1addbbcceb33435744f0eab92c 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"