Ported disable login/tp screen options from Emerald (in Preferences > Advanced)

1 files changed, 3 insertions, 3 deletions

diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 28d048b..6f7de25 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -348,7 +348,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         // Transition to REQUESTED.  Viewer has sent some kind
                         // of TeleportRequest to the source simulator
                         gTeleportDisplayTimer.reset();
-                        gViewerWindow->setShowProgress(TRUE);
+                        if(!gSavedSettings.getBOOL("DisableTeleportScreens"))gViewerWindow->setShowProgress(TRUE);
                         gViewerWindow->setProgressPercent(0);
                         gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
                         gAgent.setTeleportMessage(
@@ -376,14 +376,14 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
                         gAgent.setTeleportMessage(
                                 LLAgent::sTeleportProgressMessages["arriving"]);
                         gImageList.mForceResetTextureStats = TRUE;
-                        gAgent.resetView(TRUE, TRUE);
+                        if(!gSavedSettings.getBOOL("DisableTeleportScreens"))gAgent.resetView(TRUE, TRUE);
                         break;
 
                 case LLAgent::TELEPORT_ARRIVING:
                         // Make the user wait while content "pre-caches"
                         {
                                 F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / TELEPORT_ARRIVAL_DELAY);
-                                if( arrival_fraction > 1.f )
+                                if( arrival_fraction > 1.f || gSavedSettings.getBOOL("DisableTeleportScreens"))
                                 {
                                         arrival_fraction = 1.f;
                                         LLFirstUse::useTeleport();