summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-12-14 12:04:05 -0800
committerRick Pasetto <rick@lindenlab.com>2009-12-14 12:04:05 -0800
commit5b6e4577ae6073650d78e1181ca5b60c527a7ae7 (patch)
tree45c176dc0d3e8cf674fd1c0ca93136e77647bf61 /indra/newview/llviewermedia.cpp
parent962a42a331992344ecef4b5b8acd209b953c4512 (diff)
parentda3ca7c5b9ce3493e99aa261a075dbc2ca16b5c9 (diff)
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 57e4ed0c1e..7c5b360b92 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -558,6 +558,20 @@ bool LLViewerMedia::getInWorldMediaDisabled()
return sInWorldMediaDisabled;
}
+//////////////////////////////////////////////////////////////////////////////////////////
+// static
+bool LLViewerMedia::isInterestingEnough(const LLUUID &object_id, const F64 &object_interest)
+{
+ if (LLViewerMediaFocus::getInstance()->getFocusedObjectID() == object_id)
+ {
+ return true;
+ }
+ else {
+ // XXX HACK
+ return object_interest > 1023;// INTEREST_THRESHHOLD;
+ }
+}
+
LLViewerMedia::impl_list &LLViewerMedia::getPriorityList()
{
return sViewerMediaImplList;