summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-01-11 11:39:32 -0800
committerCallum Prentice <callum@lindenlab.com>2010-01-11 11:39:32 -0800
commit832f135fd21d6efcabc2b3e4e91580e6f31b7e8c (patch)
treea5634c8670942b7b8fc161247da7e3a1ca99c837 /indra/newview/llviewermedia.h
parent817798ece05ffc4dd4f42bad204e330f87c2d247 (diff)
parent158005d5ec90dfe31ba8c22c5dbd6b52c78fcac7 (diff)
Merge with tip
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