Second Life viewer sources 1.18.3.2-RC

1 files changed, 2 insertions, 18 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 13a4c41..fb52827 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1305,7 +1305,7 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated)
                 {
                         if (!gQuit)
                         {
-                                if (gStartupState >= STATE_STARTED)
+                                if (LLStartUp::getStartupState() >= STATE_STARTED)
                                 {
                                         // if we're in world, show a progress bar to hide reloading of textures
                                         llinfos << "Restoring GL during activate" << llendl;
@@ -2746,27 +2746,11 @@ BOOL LLViewerWindow::handlePerFrameHover()
 
         gPipeline.sRenderProcessBeacons = FALSE;
         KEY key = gKeyboard->currentKey();
-        if (((mask & MASK_CONTROL) && ('N' == key || 'n' == key)) || (gFloaterTools && gFloaterTools->getVisible()) || gSavedSettings.getBOOL("BeaconAlwaysOn"))
+        if (((mask & MASK_CONTROL) && ('N' == key || 'n' == key)) || gSavedSettings.getBOOL("BeaconAlwaysOn"))
         {
                 gPipeline.sRenderProcessBeacons = TRUE;
         }
 
-/*
-        // Show joints while in edit mode and hold down alt key.
-        if (gHUDManager)
-        {
-                BOOL menuOption = gSavedSettings.getBOOL("AltShowsPhysical");
-                if (menuOption
-                        || (gFloaterTools && gFloaterTools->getVisible()))
-                {
-                        gHUDManager->toggleShowPhysical( mask & MASK_ALT );
-                }
-                else
-                {
-                        gHUDManager->toggleShowPhysical( FALSE );
-                }
-        }
-*/
         BOOL handled = FALSE;
 
         BOOL handled_by_top_ctrl = FALSE;