diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:32:32 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-15 14:32:32 -0800 |
| commit | e62ee60e11b0056cb38ec180d1e4ee3891636177 (patch) | |
| tree | c1f26801e3a1aa5cbbf7a918d5871bd0616442ac /indra/newview/llviewermedia.h | |
| parent | 89a8182c2cd8d04b85c70d82f654714b83afebb8 (diff) | |
| parent | 9cf8c3e654f38745c8a94cbd85609a17f482266a (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(); |