diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-03-25 17:24:06 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-03-25 17:24:06 +0200 |
| commit | d9545003ed3b4f28d10ccee6939831ff7d74b53f (patch) | |
| tree | ee93cfdc044722568e39ac291d7fa6081916f990 /indra | |
| parent | 107b6687184814e8fdf8946c897355655eb0ce84 (diff) | |
MAINT-6257 Particle textures loading issues.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llviewertexturelist.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index e580ecaba1..00338cb884 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -183,7 +183,11 @@ void LLViewerTextureList::doPreloadImages() image->setAddressMode(LLTexUnit::TAM_WRAP); mImagePreloads.insert(image); } - + image = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c", FTT_LOCAL_FILE, MIPMAP_YES, LLViewerFetchedTexture::BOOST_CLOUDS); + if (image) + { + mImagePreloads.insert(image); + } } static std::string get_texture_list_name() diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a26b5e0a98..cb2d3de873 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2526,8 +2526,13 @@ void LLVOAvatar::idleUpdateLoadingEffect() particle_parameters.mPartData.mStartColor = LLColor4(1, 1, 1, 0.5f); particle_parameters.mPartData.mEndColor = LLColor4(1, 1, 1, 0.0f); particle_parameters.mPartData.mStartScale.mV[VX] = 0.8f; - LLViewerTexture* cloud = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c"); - particle_parameters.mPartImageID = cloud->getID(); + static LLUUID cloud_id = LLUUID::null; + if (cloud_id == LLUUID::null) + { + LLViewerTexture* cloud = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c"); + cloud_id = cloud->getID(); + } + particle_parameters.mPartImageID = cloud_id; particle_parameters.mMaxAge = 0.f; particle_parameters.mPattern = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE; particle_parameters.mInnerAngle = F_PI; |