diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-06-21 21:31:40 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-06-21 21:31:40 +0300 |
| commit | 30cc3ff01f39952b6138fad4095ea032d4b832a4 (patch) | |
| tree | 28442fb641cb11bf0576aa23c750d74bf413a254 /indra/newview/llviewerparcelmediaautoplay.cpp | |
| parent | 8369276a4967185985cb5957b22cda6897e2df29 (diff) | |
DRTVWR-493 LLViewerParcelMedia to singleton
Diffstat (limited to 'indra/newview/llviewerparcelmediaautoplay.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmediaautoplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerparcelmediaautoplay.cpp b/indra/newview/llviewerparcelmediaautoplay.cpp index 57ee583eae..d38a434d6c 100644 --- a/indra/newview/llviewerparcelmediaautoplay.cpp +++ b/indra/newview/llviewerparcelmediaautoplay.cpp @@ -122,7 +122,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() (mTimeInParcel > AUTOPLAY_TIME) && // and if we've been here for so many seconds (!this_media_url.empty()) && // and if the parcel has media (stricmp(this_media_type.c_str(), LLMIMETypes::getDefaultMimeType().c_str()) != 0) && - (LLViewerParcelMedia::sMediaImpl.isNull())) // and if the media is not already playing + (!LLViewerParcelMedia::getInstance()->hasParcelMedia())) // and if the media is not already playing { if (this_media_texture_id.notNull()) // and if the media texture is good { @@ -144,7 +144,7 @@ BOOL LLViewerParcelMediaAutoPlay::tick() if (gSavedSettings.getBOOL("ParcelMediaAutoPlayEnable")) { // and last but not least, only play when autoplay is enabled - LLViewerParcelMedia::play(this_parcel); + LLViewerParcelMedia::getInstance()->play(this_parcel); } } |