diff options
| author | Dave Parks <davep@lindenlab.com> | 2024-08-28 10:57:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-28 10:57:53 -0500 |
| commit | 9d689c6145cefcc86b228462279859dfb726429d (patch) | |
| tree | db1944a9a05dfde76ceb023793c780a7fe7d9767 /indra/newview/llviewertexturelist.cpp | |
| parent | 5c16ae13758bdfe8fe1f13d5f67eabbb6eaa30a1 (diff) | |
| parent | 00acf4fdb7e953726240f76f8b5103c82e0ce692 (diff) | |
Merge pull request #2435 from secondlife/2432-default-nametags-to-only-show-briefly
#2432 default nametags to only show briefly and #2431 fix redundant search for pixiesmall.j2c
Diffstat (limited to 'indra/newview/llviewertexturelist.cpp')
| -rw-r--r-- | indra/newview/llviewertexturelist.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index a5700ab264..53b054cb24 100644 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -123,6 +123,9 @@ void LLViewerTextureList::doPreloadImages() LLTexUnit::sWhiteTexture = LLViewerFetchedTexture::sWhiteImagep->getTexName(); LLUIImageList* image_list = LLUIImageList::getInstance(); + // Set default particle texture + LLViewerFetchedTexture::sDefaultParticleImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); + // Set the default flat normal map // BLANK_OBJECT_NORMAL has a version on dataserver, but it has compression artifacts LLViewerFetchedTexture::sFlatNormalImagep = @@ -403,6 +406,7 @@ LLViewerFetchedTexture* LLViewerTextureList::getImageFromFile(const std::string& const LLUUID& force_id) { LL_PROFILE_ZONE_SCOPED_CATEGORY_TEXTURE; + LL_PROFILE_ZONE_TEXT(filename.c_str(), filename.size()); if(!mInitialized) { return NULL ; |