From 9b001fad99399fcbf6705063d5ac678f5adaf22f Mon Sep 17 00:00:00 2001 From: Andrew Dyukov Date: Mon, 15 Feb 2010 17:08:52 +0200 Subject: Fixed major bug EXT-4911 (Viewer exits if "Cancel" is pressed while teleporting inside region). - LLProgressView::onCancelButtonClicked() now requests quit depending on startup state instead of teleport state. --HG-- branch : product-engine --- indra/newview/llprogressview.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp index 7a48f890e0..0476e785a5 100644 --- a/indra/newview/llprogressview.cpp +++ b/indra/newview/llprogressview.cpp @@ -223,7 +223,10 @@ void LLProgressView::setCancelButtonVisible(BOOL b, const std::string& label) // static void LLProgressView::onCancelButtonClicked(void*) { - if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) + // Quitting viewer here should happen only when "Quit" button is pressed while starting up. + // Check for startup state is used here instead of teleport state to avoid quitting when + // cancel is pressed while teleporting inside region (EXT-4911) + if (LLStartUp::getStartupState() < STATE_STARTED) { LLAppViewer::instance()->requestQuit(); } -- cgit v1.2.3