diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-10-29 11:24:06 -0700 |
commit | e777f9cbe6a10c7897fb6ba46fa300feae7831e7 (patch) | |
tree | 88b304403137989d3da13cac35b69277115619fe /indra/media_plugins/base/media_plugin_base.cpp | |
parent | c4992e30654775c54e3dc4fb583375ec079b23a4 (diff) | |
parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) |
Merge with remote repo
Diffstat (limited to 'indra/media_plugins/base/media_plugin_base.cpp')
-rw-r--r-- | indra/media_plugins/base/media_plugin_base.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/media_plugins/base/media_plugin_base.cpp b/indra/media_plugins/base/media_plugin_base.cpp index 0b7092fad6..6acac07423 100644 --- a/indra/media_plugins/base/media_plugin_base.cpp +++ b/indra/media_plugins/base/media_plugin_base.cpp @@ -64,6 +64,7 @@ std::string MediaPluginBase::statusString() case STATUS_ERROR: result = "error"; break; case STATUS_PLAYING: result = "playing"; break; case STATUS_PAUSED: result = "paused"; break; + case STATUS_DONE: result = "done"; break; default: // keep the empty string break; |