diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-16 23:36:54 -0500 |
| commit | e3a71c74e24cc052bab14544730bcd9bcef35ca8 (patch) | |
| tree | 109f6c98feea64f01330960407634eee9196356b /indra/newview/llprogressview.cpp | |
| parent | 69032d8d9d660de5b3c97589b7cc55dac70b153c (diff) | |
| parent | 6552874c82ed5ed09cf0a4d16351cdd5c8698755 (diff) | |
automated merge from viewer-2-0
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(); } |