diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-09-28 18:01:02 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-10-18 18:38:25 +0800 |
| commit | ad3cbb9f75c4ea7f0473225afc034c403b54fc82 (patch) | |
| tree | 4e4239e97a405d2820e26a4f2215ad8ccb88af7e /indra/newview/llviewerpartsource.cpp | |
| parent | 7fdb350e487acc35b26de6e243ff27f94185d3a5 (diff) | |
| parent | 64c055f9be03861661f8c211ae36ba0db489b12d (diff) | |
Merge remote-tracking branch 'secondlife/release/2024.09-ExtraFPS' into 2024.09-ExtraFPS
Diffstat (limited to 'indra/newview/llviewerpartsource.cpp')
| -rw-r--r-- | indra/newview/llviewerpartsource.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewerpartsource.cpp b/indra/newview/llviewerpartsource.cpp index dd6a404836..54e0470604 100644 --- a/indra/newview/llviewerpartsource.cpp +++ b/indra/newview/llviewerpartsource.cpp @@ -114,7 +114,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) llassert(source_objp); mSourceObjectp = source_objp; mPosAgent = mSourceObjectp->getPositionAgent(); - mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); + mImagep = LLViewerFetchedTexture::sDefaultParticleImagep; mImagep->setAddressMode(LLTexUnit::TAM_CLAMP); } @@ -619,7 +619,7 @@ void LLViewerPartSourceSpiral::update(const F32 dt) { if (!mImagep) { - mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); + mImagep = LLViewerFetchedTexture::sDefaultParticleImagep; } const F32 RATE = 0.025f; @@ -789,7 +789,7 @@ void LLViewerPartSourceBeam::update(const F32 dt) if (!mImagep) { - mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); + mImagep = LLViewerFetchedTexture::sDefaultParticleImagep; } LLViewerPart* part = new LLViewerPart(); @@ -876,7 +876,7 @@ void LLViewerPartSourceChat::update(const F32 dt) { if (!mImagep) { - mImagep = LLViewerTextureManager::getFetchedTextureFromFile("pixiesmall.j2c"); + mImagep = LLViewerFetchedTexture::sDefaultParticleImagep; } |