diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llviewerdisplay.cpp | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llviewerdisplay.cpp')
| -rw-r--r-- | indra/newview/llviewerdisplay.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index fa2a12b34a..5bae78367e 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -15,6 +15,7 @@ #include "lldir.h" #include "lldynamictexture.h" #include "lldrawpoolalpha.h" +#include "llfeaturemanager.h" #include "llframestats.h" #include "llgl.h" #include "llglheaders.h" @@ -197,7 +198,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) // Bail out if we're in the startup state and don't want to try to // render the world. // - if (gStartupState < STATE_STARTED) + if (LLStartUp::getStartupState() < STATE_STARTED) { display_startup(); return; @@ -295,12 +296,6 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) } break; - case LLAgent::TELEPORT_CANCELLING: - gViewerWindow->setProgressCancelButtonVisible(FALSE, "Cancel"); - gViewerWindow->setProgressPercent( 100.f ); - gViewerWindow->setProgressString("Canceling..."); - break; - case LLAgent::TELEPORT_NONE: // No teleport in progress gViewerWindow->setShowProgress(FALSE); @@ -410,7 +405,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield) } else { - LLPipeline::sUseOcclusion = gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery; + LLPipeline::sUseOcclusion = gSavedSettings.getBOOL("UseOcclusion") && gGLManager.mHasOcclusionQuery && gFeatureManagerp->isFeatureAvailable("UseOcclusion"); } stop_glerror(); |