diff options
| author | Callum Linden <callum@lindenlab.com> | 2016-07-20 19:54:54 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2016-07-20 19:54:54 -0700 |
| commit | 8a25489591d6f7c6c8aa95c98bbdcfe06d075c00 (patch) | |
| tree | cc520cfa6a698d133ffa727ab81f002670927244 /indra/media_plugins/base | |
| parent | cd47f86c4ab6dd2bdeb98db06acd64d02cdff96f (diff) | |
MAINT-6578 Broken texture batching - fixed along with misc LibVLC plugin additions (status, titles, looping)
Diffstat (limited to 'indra/media_plugins/base')
| -rw-r--r-- | indra/media_plugins/base/media_plugin_base.cpp | 1 | ||||
| -rw-r--r-- | indra/media_plugins/base/media_plugin_base.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp index 37c498664a..a813d5f465 100644 --- a/indra/media_plugins/base/media_plugin_base.cpp +++ b/indra/media_plugins/base/media_plugin_base.cpp @@ -73,6 +73,7 @@ std::string MediaPluginBase::statusString() case STATUS_PLAYING: result = "playing"; break; case STATUS_PAUSED: result = "paused"; break; case STATUS_DONE: result = "done"; break; + case STATUS_BUFFERING: result = "buffering"; break; default: // keep the empty string break; diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h index 38b8226bb3..99bc49fc70 100644 --- a/indra/media_plugins/base/media_plugin_base.h +++ b/indra/media_plugins/base/media_plugin_base.h @@ -56,7 +56,8 @@ protected: STATUS_ERROR, STATUS_PLAYING, STATUS_PAUSED, - STATUS_DONE + STATUS_DONE, + STATUS_BUFFERING } EStatus; /** Plugin shared memory. */ |