From 65d82fe192bdb4eb27766cf02eadaf78012f2817 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Thu, 21 Jul 2011 13:10:28 -0500 Subject: SH-2031 Fix for stall in "Cleanup" --- indra/newview/llappviewer.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 80ac385e3b..1fef8d005a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4015,6 +4015,8 @@ public: static LLFastTimer::DeclareTimer FTM_AUDIO_UPDATE("Update Audio"); static LLFastTimer::DeclareTimer FTM_CLEANUP("Cleanup"); +static LLFastTimer::DeclareTimer FTM_CLEANUP_DRAWABLES("Drawables"); +static LLFastTimer::DeclareTimer FTM_CLEANUP_OBJECTS("Objects"); static LLFastTimer::DeclareTimer FTM_IDLE_CB("Idle Callbacks"); static LLFastTimer::DeclareTimer FTM_LOD_UPDATE("Update LOD"); static LLFastTimer::DeclareTimer FTM_OBJECTLIST_UPDATE("Update Objectlist"); @@ -4291,8 +4293,14 @@ void LLAppViewer::idle() { LLFastTimer t(FTM_CLEANUP); - gObjectList.cleanDeadObjects(); - LLDrawable::cleanupDeadDrawables(); + { + LLFastTimer t(FTM_CLEANUP_OBJECTS); + gObjectList.cleanDeadObjects(); + } + { + LLFastTimer t(FTM_CLEANUP_DRAWABLES); + LLDrawable::cleanupDeadDrawables(); + } } // -- cgit v1.2.3 From fbd5bd7adc205acecc49c7e9887efa3bca6552d0 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Mon, 1 Aug 2011 17:50:43 -0500 Subject: SH-2183 Add a debug setting to control whether or not to use multiple threads in LLCurl --- 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 b65933f8a1..d12b971bde 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -708,7 +708,7 @@ bool LLAppViewer::init() // *NOTE:Mani - LLCurl::initClass is not thread safe. // Called before threads are created. - LLCurl::initClass(); + LLCurl::initClass(gSavedSettings.getBOOL("CurlUseMultipleThreads")); LL_INFOS("InitInfo") << "LLCurl initialized." << LL_ENDL ; LLMachineID::init(); -- cgit v1.2.3