summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexlayer.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 15:45:58 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-09-26 15:45:58 -0400
commit93e210d91f521b01deb10aa6aa25160364e6ae28 (patch)
treec2205093d0b57ca6d1037ec90bde18615bc16e7e /indra/newview/llviewertexlayer.cpp
parentab83fab72c66e753917001a9030aa55e69a3c496 (diff)
more state management stuff, DRANO flags for problematic areas
Diffstat (limited to 'indra/newview/llviewertexlayer.cpp')
-rwxr-xr-xindra/newview/llviewertexlayer.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewertexlayer.cpp b/indra/newview/llviewertexlayer.cpp
index 9477e89f1c..b129c28e0d 100755
--- a/indra/newview/llviewertexlayer.cpp
+++ b/indra/newview/llviewertexlayer.cpp
@@ -285,8 +285,7 @@ BOOL LLViewerTexLayerSetBuffer::uploadInProgress() const
BOOL LLViewerTexLayerSetBuffer::isReadyToUpload() const
{
if (!gAgentQueryManager.hasNoPendingQueries()) return FALSE; // Can't upload if there are pending queries.
- // FIXME DRANO - should be checking local appearance?
- if (isAgentAvatarValid() && !gAgentAvatarp->isUsingServerBakes()) return FALSE; // Don't upload if avatar is using composites.
+ if (isAgentAvatarValid() && gAgentAvatarp->isEditingAppearance()) return FALSE; // Don't upload if avatar is being edited.
BOOL ready = FALSE;
if (getViewerTexLayerSet()->isLocalTextureDataFinal())