diff options
| author | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-10-18 17:58:27 -0700 |
| commit | e4b0e7c82d670081c071d8a3da31b5ec407b8e07 (patch) | |
| tree | 9410962bbb582eedbec448139e217f2714050777 /linden/indra/newview/llprogressview.cpp | |
| parent | Started 1.3.0 branch (diff) | |
| parent | Updated and added some Linux libs. (diff) | |
| download | meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.zip meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.gz meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.bz2 meta-impy-e4b0e7c82d670081c071d8a3da31b5ec407b8e07.tar.xz | |
Merged working branch of 1.2 into LL 1.23 merge
Diffstat (limited to '')
| -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 bfd14f7..aa7a61f 100644 --- a/linden/indra/newview/llprogressview.cpp +++ b/linden/indra/newview/llprogressview.cpp | |||
| @@ -228,7 +228,7 @@ void LLProgressView::onCancelButtonClicked(void*) | |||
| 228 | { | 228 | { |
| 229 | if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) | 229 | if (gAgent.getTeleportState() == LLAgent::TELEPORT_NONE) |
| 230 | { | 230 | { |
| 231 | LLAppViewer::instance()->requestQuit(); | 231 | LLAppViewer::instance()->requestLogout(true); |
| 232 | } | 232 | } |
| 233 | else | 233 | else |
| 234 | { | 234 | { |