summaryrefslogtreecommitdiff
path: root/indra/newview/llvoavatar.cpp
diff options
context:
space:
mode:
authorandreykproductengine <akleshchev@productengine.com>2016-03-25 17:24:06 +0200
committerandreykproductengine <akleshchev@productengine.com>2016-03-25 17:24:06 +0200
commitd9545003ed3b4f28d10ccee6939831ff7d74b53f (patch)
treeee93cfdc044722568e39ac291d7fa6081916f990 /indra/newview/llvoavatar.cpp
parent107b6687184814e8fdf8946c897355655eb0ce84 (diff)
MAINT-6257 Particle textures loading issues.
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
-rwxr-xr-xindra/newview/llvoavatar.cpp9
1 files changed, 7 insertions, 2 deletions
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;