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/media_plugins/base/media_plugin_base.cpp | |
parent | d6a2c5965e6b0b07014e8fc2dbb16edc463e0566 (diff) | |
parent | 8ae2f388b69105b81c49483bdae443aabfa9e26e (diff) |
Yet another merge from 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; |