summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorMonroe Linden <monroe@lindenlab.com>2010-01-08 17:33:44 -0800
committerMonroe Linden <monroe@lindenlab.com>2010-01-08 17:33:44 -0800
commitb88563b23bed940f44f863814ad12dac13f823da (patch)
treeda2997f8e1c93d89c6680e4c4271ebeca0b30645 /indra/newview/llviewermedia.h
parent0f04c65178b96b2fa03a4a727348bc90dc27c2d0 (diff)
Made AudioStreamingMedia setting control loading of prim media as well as parcel media.
Moved the media first-run dialog code from llviewerparcelmedia.cpp to llviewermedia.cpp, and made it come up for both prim and parcel media.
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r--indra/newview/llviewermedia.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index b103c48bd8..3ce9f1887c 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -115,6 +115,12 @@ class LLViewerMedia
// This is the comparitor used to sort the list.
static bool priorityComparitor(const LLViewerMediaImpl* i1, const LLViewerMediaImpl* i2);
+
+ // For displaying the media first-run dialog.
+ static bool needsMediaFirstRun();
+ static void displayMediaFirstRun();
+ static bool firstRunCallback(const LLSD& notification, const LLSD& response);
+
};
// Implementation functions not exported into header file