diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-10-30 12:48:44 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-30 12:48:44 -0700 |
| commit | 130fe8184d4fbf451d7f8e586eeceb02692fa6ef (patch) | |
| tree | 4cd52043fa3abca7b9170f6c2365842d3756c64c /indra/newview/llviewermedia.cpp | |
| parent | b6df544fc0842464235646293e1ccbd7d2941324 (diff) | |
Fix a couple other build issues with my previous commit.
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index e8835b34f0..92022441b7 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) { |