diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-03-29 15:17:15 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-03-29 15:17:15 +0300 |
| commit | 783cc9756ad6cc07d27bf985171c922aa20b0fc8 (patch) | |
| tree | eefccb485d124d264150a7c479dc68843228e0ab /indra/newview | |
| parent | 272d40a0892108de5e54f8b440f95e4c270686a7 (diff) | |
Backed out changeset: ca5d40144cc2
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llviewertexturelist.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/llvoavatar.cpp | 9 |
2 files changed, 3 insertions, 12 deletions
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index 00338cb884..e580ecaba1 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -183,11 +183,7 @@ 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 cb2d3de873..a26b5e0a98 100755 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -2526,13 +2526,8 @@ 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; - 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; + LLViewerTexture* cloud = LLViewerTextureManager::getFetchedTextureFromFile("cloud-particle.j2c"); + particle_parameters.mPartImageID = cloud->getID(); particle_parameters.mMaxAge = 0.f; particle_parameters.mPattern = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE; particle_parameters.mInnerAngle = F_PI; |