From 75406641836fee796428216df82b7e29ad24443a Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Wed, 13 Aug 2014 18:12:25 -0700 Subject: Ported from defective branch. --- indra/newview/llappviewer.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 24150daea4..29b883aef1 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4896,7 +4896,10 @@ void LLAppViewer::idle() // Handle the regular UI idle callbacks as well as // hover callbacks // - + +#ifdef LL_DARWIN SPATTERS may want to make this mac-only. Test on Windows. + if (mQuitRequested) //MAINT-4243 +#endif { // LL_RECORD_BLOCK_TIME(FTM_IDLE_CB); -- cgit v1.2.3 From 7060527bbc9a7a76cbc3b4b9bb772cb90542fd60 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 15 Aug 2014 17:30:09 -0700 Subject: Added delay to Windows shutdown to let SLVoice die a good death. --- indra/newview/llappviewer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 29b883aef1..bf1a0a4173 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4897,7 +4897,7 @@ void LLAppViewer::idle() // hover callbacks // -#ifdef LL_DARWIN SPATTERS may want to make this mac-only. Test on Windows. +#ifdef LL_DARWIN if (mQuitRequested) //MAINT-4243 #endif { -- cgit v1.2.3 From 370aa671c66cfd5e2a338602d2e9765e9ea103f8 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Fri, 15 Aug 2014 18:49:54 -0700 Subject: Allegedly hides voice position on teleport. Needs testing. --- indra/newview/llappviewer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 29b883aef1..9cc21ad22e 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4897,8 +4897,8 @@ void LLAppViewer::idle() // hover callbacks // -#ifdef LL_DARWIN SPATTERS may want to make this mac-only. Test on Windows. - if (mQuitRequested) //MAINT-4243 +#ifdef LL_DARWIN //SPATTERS may want to make this mac-only. Test on Windows. + if (!mQuitRequested) //MAINT-4243 #endif { // LL_RECORD_BLOCK_TIME(FTM_IDLE_CB); -- cgit v1.2.3