summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-05-25 20:17:31 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-05-25 20:17:31 -0400
commit946af937d7743656197afcfc1a4239ac71a438f1 (patch)
treea0bb82d47c578993bda3e153765e4312cede6517 /indra/newview/llviewerwindow.cpp
parent6885a1a6ad62f0e0e08a272911c8ac057a5cd94d (diff)
parentb524aacb599b8c907e02eeb56b7441f42e9ddad2 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index e0463e3c4a..f72f122f8a 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4545,7 +4545,7 @@ void LLViewerWindow::restoreGL(const std::string& progress_message)
gResizeScreenTexture = TRUE;
- if (gFloaterCustomize && gFloaterCustomize->getVisible())
+ if (gAgentCamera.cameraCustomizeAvatar())
{
LLVisualParamHint::requestHintUpdates();
}