diff options
| author | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-25 22:15:49 -0500 |
| commit | 5ff1687542240fe9b00d4c217b764770fc369c06 (patch) | |
| tree | bc5a1dbc882c19120ca00efb9914d70059cd79cb /linden/indra/newview/llprogressview.cpp | |
| parent | Merge remote branch 'mccabe/1.2.0-next' into next (diff) | |
| parent | Removed grid stuff from World Map (for now). (diff) | |
| download | meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.zip meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.gz meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.bz2 meta-impy-5ff1687542240fe9b00d4c217b764770fc369c06.tar.xz | |
Merge branch 'gridmanager' into next
Diffstat (limited to 'linden/indra/newview/llprogressview.cpp')
| -rw-r--r-- | linden/indra/newview/llprogressview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llprogressview.cpp b/linden/indra/newview/llprogressview.cpp index a38aada..157dc6c 100644 --- a/linden/indra/newview/llprogressview.cpp +++ b/linden/indra/newview/llprogressview.cpp | |||
| @@ -407,7 +407,7 @@ void LLProgressView::onCancelButtonClicked(void*) | |||
| 407 | { | 407 | { |
| 408 | if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) | 408 | if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) |
| 409 | { | 409 | { |
| 410 | LLAppViewer::instance()->requestQuit(); | 410 | LLAppViewer::instance()->requestLogout(true); |
| 411 | } | 411 | } |
| 412 | else | 412 | else |
| 413 | { | 413 | { |