From e5124431b54d4342d4677371fccca5bc7250c079 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 2 Jul 2007 17:10:30 +0000
Subject: svn merge -r 64079:64548
 svn+ssh://svn/svn/linden/branches/maintenance into release

---
 indra/newview/llprogressview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llprogressview.cpp')

diff --git a/indra/newview/llprogressview.cpp b/indra/newview/llprogressview.cpp
index 3bfe913ab4..d91bb7d5cf 100644
--- a/indra/newview/llprogressview.cpp
+++ b/indra/newview/llprogressview.cpp
@@ -104,7 +104,7 @@ BOOL LLProgressView::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
 		// Suck up all keystokes except CTRL-Q.
 		if( ('Q' == key) && (MASK_CONTROL == mask) )
 		{
-			app_request_quit();
+			app_user_quit();
 		}
 		return TRUE;
 	}
-- 
cgit v1.2.3