diff options
| author | McCabe Maxsted | 2009-02-26 18:24:14 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-02-26 18:24:14 -0700 |
| commit | 635bf84bd76978d762d8ee193c991a7dbbab23d6 (patch) | |
| tree | 69176a1ddf7ff7462421e9b2a7f0b45fa93aa229 /linden/indra/llmedia/llmediabase.h | |
| parent | Fixed copy_win_libs (diff) | |
| parent | get_state shows name info (diff) | |
| download | meta-impy-635bf84bd76978d762d8ee193c991a7dbbab23d6.zip meta-impy-635bf84bd76978d762d8ee193c991a7dbbab23d6.tar.gz meta-impy-635bf84bd76978d762d8ee193c991a7dbbab23d6.tar.bz2 meta-impy-635bf84bd76978d762d8ee193c991a7dbbab23d6.tar.xz | |
merged in last working media changes
Diffstat (limited to 'linden/indra/llmedia/llmediabase.h')
| -rw-r--r-- | linden/indra/llmedia/llmediabase.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/llmedia/llmediabase.h b/linden/indra/llmedia/llmediabase.h index dad02ca..b5b9420 100644 --- a/linden/indra/llmedia/llmediabase.h +++ b/linden/indra/llmedia/llmediabase.h | |||
| @@ -153,7 +153,8 @@ class LLMediaBase | |||
| 153 | STATUS_STARTED = 3, | 153 | STATUS_STARTED = 3, |
| 154 | STATUS_STOPPED = 4, | 154 | STATUS_STOPPED = 4, |
| 155 | STATUS_PAUSED = 6, | 155 | STATUS_PAUSED = 6, |
| 156 | STATUS_RESETTING = 7 | 156 | STATUS_RESETTING = 7, |
| 157 | STATUS_DEAD = 8 | ||
| 157 | }; | 158 | }; |
| 158 | virtual bool addCommand( ECommand cmd ) = 0; | 159 | virtual bool addCommand( ECommand cmd ) = 0; |
| 159 | virtual bool clearCommand() = 0; | 160 | virtual bool clearCommand() = 0; |