summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-05-02 13:00:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-05-02 13:00:59 -0400
commit678864e4ed497de7d17e02fa79b93be54379a5b8 (patch)
treef946f0f5ffc116d2ba9c9ada237eb70594966ee6 /indra/newview/llviewermedia.h
parent78fec489b53434a8ac8f9c0a8e72fd883067ce42 (diff)
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
merge viewer-release to drano
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 15dcda59cf..fff5b3fc08 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -112,9 +112,6 @@ public:
static F32 getVolume();
static void muteListChanged();
- static void setInWorldMediaDisabled(bool disabled);
- static bool getInWorldMediaDisabled();
-
static bool isInterestingEnough(const LLVOVolume* object, const F64 &object_interest);
// Returns the priority-sorted list of all media impls.