diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-05-27 17:05:30 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-05-27 17:05:30 -0400 |
| commit | 0c7fafb70425853df26c703969e7a1892de2374e (patch) | |
| tree | 22e8d38c750efc4df177c5eb04cd1ab66c92abce /indra/newview/llviewerwindow.cpp | |
| parent | d213946c6c8a3adda488e95e669514f6317beeb7 (diff) | |
| parent | 2a061dbccc7ecadce7470ee272b6b10c5d551ff4 (diff) | |
merge
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(); } |