diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-27 14:52:46 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-27 14:52:46 -0400 |
| commit | 9a0a68aa4468ccc072be0bf310ff2a5f4cd50f61 (patch) | |
| tree | 324dc93040afe652fb2a1da4d617b794e0f2297f /indra/newview/llviewerwindow.cpp | |
| parent | 7477f9054846e1d8a11d0e31c51bd35efa9b4c18 (diff) | |
| parent | cd46893057b9ec7d309059eff3f503cfaf46de56 (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9773275ede..da4ff1568b 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -106,7 +106,6 @@ #include "llfloaterbuildoptions.h" #include "llfloaterbuyland.h" #include "llfloatercamera.h" -#include "llfloatercustomize.h" #include "llfloaterland.h" #include "llfloaterinspect.h" #include "llfloatermap.h" @@ -4551,7 +4550,7 @@ void LLViewerWindow::restoreGL(const std::string& progress_message) gResizeScreenTexture = TRUE; - if (gFloaterCustomize && gFloaterCustomize->getVisible()) + if (gAgentCamera.cameraCustomizeAvatar()) { LLVisualParamHint::requestHintUpdates(); } |