From b302f15deea0f4f7f5de75bfd3776c17021b6444 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 1 Feb 2008 02:23:35 +0000 Subject: EFFECTIVE MERGE: maint-viewer-3 -r 77368:77381 -> release ACTUAL MERGE: merge maint-viewer-3-merge -r 79051 -> release --- indra/newview/llstartup.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index b50c264c35..8570055f87 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2412,8 +2412,13 @@ BOOL idle_startup() LLStartUp::setStartupState( STATE_STARTED ); - // Unmute audio if desired and setup volumes + // Unmute audio if desired and setup volumes. + // Unmute audio if desired and setup volumes. + // This is a not-uncommon crash site, so surround it with + // llinfos output to aid diagnosis. + llinfos << "Doing first audio_update_volume..." << llendl; audio_update_volume(); + llinfos << "Done first audio_update_volume." << llendl; // reset keyboard focus to sane state of pointing at world gFocusMgr.setKeyboardFocus(NULL); -- cgit v1.2.3