diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-02 12:17:45 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-02 12:17:45 -0800 |
| commit | b5fa4a6d0d6fe6c28673e547297dd160ab56bb06 (patch) | |
| tree | db85e53222e487d4cbdb77a58d03f2d61a74d425 /indra/newview/llviewermedia.h | |
| parent | 6d3ca60f310e50b217a189086b652dca2e3e3854 (diff) | |
| parent | 4c3d08b665800608b4597ec28cf84cfde5e65f88 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media
Diffstat (limited to 'indra/newview/llviewermedia.h')
| -rw-r--r-- | indra/newview/llviewermedia.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index e2d159304f..24e7154805 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -96,9 +96,10 @@ class LLViewerMedia static bool textureHasMedia(const LLUUID& texture_id); static void setVolume(F32 volume); - static void updateMedia(); + static void updateMedia(void* dummy_arg = NULL); static bool isMusicPlaying(); + static void initClass(); static void cleanupClass(); static void toggleMusicPlay(void*); |