summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexlayer.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 06:36:24 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 06:36:24 -0400
commitae0bb922909af95d96c140c1d74a4f39a264d4ec (patch)
treeaa75f1525641908cfa99777e11ff2ccf9228221e /indra/newview/llviewertexlayer.cpp
parentf3d52b8d54c3be67262d4d8ae9a00253e9d55249 (diff)
renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly
Diffstat (limited to 'indra/newview/llviewertexlayer.cpp')
-rw-r--r--indra/newview/llviewertexlayer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index f516562c2f..463906d3ef 100644
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -285,7 +285,8 @@ BOOL LLViewerTexLayerSetBuffer::uploadInProgress() const
BOOL LLViewerTexLayerSetBuffer::isReadyToUpload() const
{
if (!gAgentQueryManager.hasNoPendingQueries()) return FALSE; // Can't upload if there are pending queries.
- if (isAgentAvatarValid() && !gAgentAvatarp->isUsingBakedTextures()) return FALSE; // Don't upload if avatar is using composites.
+ // FIXME DRANO
+ if (isAgentAvatarValid() && !gAgentAvatarp->isUsingServerBakes()) return FALSE; // Don't upload if avatar is using composites.
BOOL ready = FALSE;
if (getViewerTexLayerSet()->isLocalTextureDataFinal())