1 files changed, 3 insertions, 8 deletions

diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index fc288c0..64ad66c 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -35,6 +35,7 @@
 #include "lldir.h"
 #include "lldynamictexture.h"
 #include "lldrawpoolalpha.h"
+#include "llfeaturemanager.h"
 #include "llframestats.h"
 #include "llgl.h"
 #include "llglheaders.h"
@@ -217,7 +218,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;
@@ -315,12 +316,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);
@@ -430,7 +425,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();