diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:36:16 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-28 17:36:16 -0700 |
commit | 61a02bfedbbc6009e6ef3579eff7fabe683aadf2 (patch) | |
tree | e5c641976f6734d38794b9209a35b7b71601c242 /indra/llplugin/llpluginclassmediaowner.h | |
parent | d6a2c5965e6b0b07014e8fc2dbb16edc463e0566 (diff) | |
parent | 8ae2f388b69105b81c49483bdae443aabfa9e26e (diff) |
Yet another merge from remote repo
Diffstat (limited to 'indra/llplugin/llpluginclassmediaowner.h')
-rw-r--r-- | indra/llplugin/llpluginclassmediaowner.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmediaowner.h b/indra/llplugin/llpluginclassmediaowner.h index 4690f09172..c798af29ca 100644 --- a/indra/llplugin/llpluginclassmediaowner.h +++ b/indra/llplugin/llpluginclassmediaowner.h @@ -70,7 +70,8 @@ public: MEDIA_ERROR, // navigation/preroll failed MEDIA_PLAYING, // playing (only for time-based media) MEDIA_PAUSED, // paused (only for time-based media) - + MEDIA_DONE // finished playing (only for time-based media) + } EMediaStatus; virtual ~LLPluginClassMediaOwner() {}; |