diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-12-01 18:45:40 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-12-01 18:45:40 -0800 |
| commit | b92fe4351c402759991c26510a2a35a3b4308999 (patch) | |
| tree | facf85c7f117d80585270c50f715e14397ecd7db /indra/newview/llviewermedia.h | |
| parent | 1db0d32133f97b03a632f03fa78e198b7f00866b (diff) | |
| parent | 659dc5224e2f4b6ce90b4f739cc015befc098c12 (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index e2d159304f..8acb485daf 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -99,6 +99,7 @@ class LLViewerMedia static void updateMedia(); static bool isMusicPlaying(); + static void initClass(); static void cleanupClass(); static void toggleMusicPlay(void*); |