diff options
| author | Jonathan Yap <none@none> | 2011-12-05 05:01:38 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2011-12-05 05:01:38 -0500 |
| commit | 3193170850ddc0fc3db57d40e9636ec77908dd70 (patch) | |
| tree | 4d26ce2367bff7237dccdd490d2d69cfb3bcf4a3 /indra/newview/llviewerparcelmgr.cpp | |
| parent | 7226b23366805ae259000df25a622fc98a722d14 (diff) | |
STORM-591 Made change per code review request: disable audio when teleport progress bar is present
Added code to start counting the fade in time on login when STATE_STARTED is set
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index c18665a3c3..7ce9672299 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1729,8 +1729,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use // Check for video LLViewerParcelMedia::update(parcel); - // Then check for music. Do this last, as there may be a delay waiting for - // the stream fading thread to finish. + // Then check for music if (gAudiop) { if (parcel) |