diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-15 18:20:02 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-15 18:20:02 -0500 |
| commit | 852bd5ef24240940991574afd2a35e4e857dbac5 (patch) | |
| tree | d01d101619346e4a8a28056623e886257168531b /indra/newview/llprogressview.cpp | |
| parent | d6027f543269610e72fc1ab1876e71a434b3461c (diff) | |
| parent | ed116da1311b281bcd815d9d3f95c1aecf67207d (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/llprogressview.cpp')
| -rw-r--r-- | indra/newview/llprogressview.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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(); } |