From 8f54dc2958e75587165623b0292940200fb49f59 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Wed, 26 Jan 2011 11:13:04 -0700 Subject: for SH-846: design and implement the debug code to locate memory leaking --- indra/newview/llappviewer.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 6a9dfaf21b..87c0085226 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1057,6 +1057,8 @@ bool LLAppViewer::mainLoop() //clear call stack records llclearcallstacks; + MEM_TRACK + //check memory availability information { if(memory_check_interval < memCheckTimer.getElapsedTimeF32()) @@ -1101,6 +1103,8 @@ bool LLAppViewer::mainLoop() } #endif + MEM_TRACK + //memory leaking simulation LLFloaterMemLeak* mem_leak_instance = LLFloaterReg::findTypedInstance("mem_leaking"); @@ -1162,6 +1166,8 @@ bool LLAppViewer::mainLoop() resumeMainloopTimeout(); } + MEM_TRACK + if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED)) { pauseMainloopTimeout(); @@ -1183,6 +1189,8 @@ bool LLAppViewer::mainLoop() } + MEM_TRACK + pingMainloopTimeout("Main:Sleep"); pauseMainloopTimeout(); @@ -1296,7 +1304,10 @@ bool LLAppViewer::mainLoop() resumeMainloopTimeout(); pingMainloopTimeout("Main:End"); - } + } + + MEM_TRACK + } catch(std::bad_alloc) { @@ -1779,6 +1790,8 @@ bool LLAppViewer::cleanup() ll_close_fail_log(); + MEM_TRACK_RELEASE + llinfos << "Goodbye!" << llendflush; // return 0; -- cgit v1.2.3 From 60696ae986c90068faa0191db737431493796dc1 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Wed, 26 Jan 2011 16:31:15 -0800 Subject: fix for STORM-940: don't show manditory update dialog if already logged in. --- indra/newview/llappviewer.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e92042bcd4..ace1de6131 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2474,10 +2474,14 @@ namespace { // The user never saw the progress bar. notification_name = "RequiredUpdateDownloadedVerboseDialog"; } - else + else if(LLStartUp::getStartupState() < STATE_WORLD_INIT) { notification_name = "RequiredUpdateDownloadedDialog"; } + else + { + ; // Do nothing because user is already logged in. + } } else { -- cgit v1.2.3 From 9653c41d3d0532a323122b0cd1b6399721bf8be8 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 27 Jan 2011 11:37:00 -0800 Subject: more for storm 940: treat the manditory download after login like an optional one. --- indra/newview/llappviewer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ace1de6131..9cc0ab377c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2468,19 +2468,23 @@ namespace { if(data["required"].asBoolean()) { - apply_callback = &apply_update_ok_callback; if(LLStartUp::getStartupState() <= STATE_LOGIN_WAIT) { // The user never saw the progress bar. + apply_callback = &apply_update_ok_callback; notification_name = "RequiredUpdateDownloadedVerboseDialog"; } else if(LLStartUp::getStartupState() < STATE_WORLD_INIT) { + // The user is logging in but blocked. + apply_callback = &apply_update_ok_callback; notification_name = "RequiredUpdateDownloadedDialog"; } else { - ; // Do nothing because user is already logged in. + // The user is already logged in; treat like an optional update. + apply_callback = &apply_update_callback; + notification_name = "DownloadBackgroundDialog"; } } else -- cgit v1.2.3 From f18bfd446b5b9a9cf91bf8b615c651074ebe8596 Mon Sep 17 00:00:00 2001 From: "Andrew A. de Laix" Date: Thu, 27 Jan 2011 11:37:59 -0800 Subject: STORM-940: use the tip, not the dialog. --- 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 9cc0ab377c..9361ae20cf 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2484,7 +2484,7 @@ namespace { { // The user is already logged in; treat like an optional update. apply_callback = &apply_update_callback; - notification_name = "DownloadBackgroundDialog"; + notification_name = "DownloadBackgroundTip"; } } else -- cgit v1.2.3 From 948afb8ef436f661dd84e3c343e22934f92570ec Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Fri, 28 Jan 2011 21:23:19 -0700 Subject: trivial: remove some debug code. --- indra/newview/llappviewer.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 87c0085226..69333ff4a3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1057,8 +1057,6 @@ bool LLAppViewer::mainLoop() //clear call stack records llclearcallstacks; - MEM_TRACK - //check memory availability information { if(memory_check_interval < memCheckTimer.getElapsedTimeF32()) @@ -1103,8 +1101,6 @@ bool LLAppViewer::mainLoop() } #endif - MEM_TRACK - //memory leaking simulation LLFloaterMemLeak* mem_leak_instance = LLFloaterReg::findTypedInstance("mem_leaking"); @@ -1166,8 +1162,6 @@ bool LLAppViewer::mainLoop() resumeMainloopTimeout(); } - MEM_TRACK - if (gDoDisconnect && (LLStartUp::getStartupState() == STATE_STARTED)) { pauseMainloopTimeout(); @@ -1189,8 +1183,6 @@ bool LLAppViewer::mainLoop() } - MEM_TRACK - pingMainloopTimeout("Main:Sleep"); pauseMainloopTimeout(); @@ -1305,9 +1297,6 @@ bool LLAppViewer::mainLoop() pingMainloopTimeout("Main:End"); } - - MEM_TRACK - } catch(std::bad_alloc) { -- cgit v1.2.3