diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-02-15 17:08:52 +0200 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-02-15 17:08:52 +0200 |
| commit | 9b001fad99399fcbf6705063d5ac678f5adaf22f (patch) | |
| tree | 031c27b46cabb2309b9ad585a5da84fdb6d6f401 /indra/newview | |
| parent | 5a1ef0214a904d13d942059420b412eaf5d7017e (diff) | |
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
Diffstat (limited to 'indra/newview')
| -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(); } |