livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FIXED] Poor people without Havok and FMOD want to build the viewer too

master
Kitty Barnett 2020-06-15 20:57:41 +02:00
parent dcdaef5596
commit b49a3ca18f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llprogressview.cpp
View File

@ -463,7 +463,10 @@ void LLProgressView::initLogos()
const S32 default_height = 28;
const S32 default_pad = 15;
S32 icon_width, icon_height;
S32 icon_width;
#if defined(LL_FMODSTUDIO) || defined(HAVOK_TPV)
S32 icon_height;
#endif // defined(LL_FMODSTUDIO) || defined(HAVOK_TPV)
// We don't know final screen rect yet, so we can't precalculate position fully
LLTextBox *logos_label = getChild<LLTextBox>("logos_lbl");
@ -478,7 +481,9 @@ void LLProgressView::initLogos()
temp_str += gDirUtilp->getDirDelimiter();
S32 pad_y = 0; // <FS:Ansariel> Build fix
#if defined(LL_FMODSTUDIO) || defined(HAVOK_TPV)
S32 pad_y = 0; // <FS:Ansariel> Build fix
#endif // defined(LL_FMODSTUDIO) || defined(HAVOK_TPV)
#ifdef LL_FMODSTUDIO
// original image size is 264x96, it is on longer side but