diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index e8835b34f0c557cf40672e11ac7d5390a62ddfa1..92022441b7414ad6bd5f9d46108e4215cb3bf7e4 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -442,7 +442,10 @@ bool LLViewerMedia::getInWorldMediaDisabled() return sInWorldMediaDisabled; } -static const impl_list &getPriorityList(); +const LLViewerMedia::impl_list &getPriorityList() +{ + return sViewerMediaImplList; +} // This is the predicate function used to sort sViewerMediaImplList by priority. bool LLViewerMedia::priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2) @@ -1668,7 +1671,7 @@ void LLViewerMediaImpl::resetPreviousMediaState() ////////////////////////////////////////////////////////////////////////////////////////// // -bool LLViewerMediaImpl::isForcedUnloaded() +bool LLViewerMediaImpl::isForcedUnloaded() const { if(mIsMuted || mMediaSourceFailed || mIsDisabled) { diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 9d814b85b3d34101a4c95d1bd8ff87ca35339fb4..f997dc8c0e7583824e19e91434f0da96f7887033 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -197,7 +197,7 @@ class LLViewerMediaImpl bool isMediaDisabled() { return mIsDisabled; }; // returns true if this instance should not be loaded (disabled, muted object, crashed, etc.) - bool isForcedUnloaded(); + bool isForcedUnloaded() const; ECursorType getLastSetCursor() { return mLastSetCursor; };