diff options
| author | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
| commit | cf52fc85ae4d06335a09b4dd60bddeb7f66841b3 (patch) | |
| tree | afa95f76e9ef3ebe9b91dce90d2a8671f28ab435 /indra/newview/llprogressview.cpp | |
| parent | 7c86d4434822d7a3172bed82c3812032089c1518 (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
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(); } |