diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-08 22:50:33 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-04-08 22:50:33 +0300 |
| commit | 5e9ecc123e146bccd36232642561b5f20de37431 (patch) | |
| tree | 1e93cc108f4d88a529def6c4961f8de4bdf70fd8 /indra/newview | |
| parent | aa58cc1edb1ba27495f5418148dd16b0f0231cc3 (diff) | |
SL-12607 Resolve grey icon on mac
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 1657e5153d..4221f941f5 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -195,7 +195,14 @@ void LLViewerTextureList::doPreloadImages() // with path relative to exe. #ifdef LL_FMODSTUDIO +#ifdef LL_WINDOWS std::string full_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "3p_icons", "fmod.png"); +#elif LL_DARWIN + // On MAC use resource directory + std::string full_path = gDirUtilp->add(gDirUtilp->getAppRODataDir(), "3p_icons", "fmod.png"); +#else + std::string full_path = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "3p_icons", "fmod.png"); +#endif image = LLViewerTextureManager::getFetchedTextureFromUrl("file://" + full_path, FTT_LOCAL_FILE, MIPMAP_YES, LLViewerFetchedTexture::BOOST_UI, LLViewerTexture::FETCHED_TEXTURE, 0, 0, IMG_LOGO_FMOD); if (image) |