diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-07-12 00:07:43 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-07-12 00:07:43 +0300 |
| commit | fca85429c5763ab0bd2a1d4c1be40443e469e375 (patch) | |
| tree | cf492062635bc947b1cca8f5758e6dfee6709021 /indra | |
| parent | a3326a4afc8f212264b1d301401e6591d194aa3f (diff) | |
SL-17753 Crash at LLStatusBar::getNearbyMediaPanel
optionallyStartMusic was called before status bar was initialized
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index e69b0347f8..9095a6b5b7 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -1959,7 +1959,7 @@ void LLViewerParcelMgr::optionallyStartMusic(const std::string &music_url, const static LLCachedControl<bool> tentative_autoplay(gSavedSettings, "MediaTentativeAutoPlay", true); // only play music when you enter a new parcel if the UI control for this // was not *explicitly* stopped by the user. (part of SL-4878) - LLPanelNearByMedia* nearby_media_panel = gStatusBar->getNearbyMediaPanel(); + LLPanelNearByMedia* nearby_media_panel = gStatusBar ? gStatusBar->getNearbyMediaPanel() : NULL; LLViewerAudio* viewer_audio = LLViewerAudio::getInstance(); // ask mode //todo constants |