diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 15:38:05 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 15:38:05 +0000 |
| commit | 7c640406dd3753aecd0be157a12539b7f06644ef (patch) | |
| tree | 031c27b46cabb2309b9ad585a5da84fdb6d6f401 /indra/newview/llprogressview.cpp | |
| parent | 32ea5e0e8473c0e53d59bd331f1419dc6f092fc9 (diff) | |
| parent | 9b001fad99399fcbf6705063d5ac678f5adaf22f (diff) | |
PE merge.
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(); } |