diff options
| author | richard <none@none> | 2009-12-17 09:57:43 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 09:57:43 -0800 |
| commit | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (patch) | |
| tree | 8e77e822118f4979759caab99df48975f79994c7 /indra/newview/llviewermedia.h | |
| parent | f452c01915be011814d92dcc1a398f450b6ce9c2 (diff) | |
| parent | 4dd37a10633c95a9806b608b4db4d0a2d3141a21 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index 26b822aba6..7151186089 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -112,7 +112,7 @@ class LLViewerMedia static void setInWorldMediaDisabled(bool disabled); static bool getInWorldMediaDisabled(); - static bool isInterestingEnough(const LLUUID& object_id, const F64 &object_interest); + static bool isInterestingEnough(const LLVOVolume* object, const F64 &object_interest); // Returns the priority-sorted list of all media impls. static impl_list &getPriorityList(); |