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 | |
| parent | b6df544fc0842464235646293e1ccbd7d2941324 (diff) | |
Fix a couple other build issues with my previous commit.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
2 files changed, 6 insertions, 3 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) { diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 9d814b85b3..f997dc8c0e 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -197,7 +197,7 @@ public: 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; }; |