diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
| commit | dc1453af9c474c67749aded576c11dff3afdd444 (patch) | |
| tree | bff4d5bfca6eb036339c30429ef08704d0bb68cb /indra/newview/llvovolume.cpp | |
| parent | 3dfdb2f6e8be4fb2a08102847520585dc1d8fd7d (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merge in from viewer-release 6.3.5
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index c060529a99..c1dd356586 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -189,7 +189,7 @@ public: virtual bool isInterestingEnough() const { - return LLViewerMedia::isInterestingEnough(mObject, getMediaInterest()); + return LLViewerMedia::getInstance()->isInterestingEnough(mObject, getMediaInterest()); } virtual std::string getCapabilityUrl(const std::string &name) const @@ -2705,7 +2705,7 @@ void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool m LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL()); update_from_self = (updating_agent == gAgent.getID()); } - viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self); + viewer_media_t media_impl = LLViewerMedia::getInstance()->updateMediaImpl(mep, previous_url, update_from_self); addMediaImpl(media_impl, texture_index) ; } |