diff options
author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-10-29 12:49:06 -0400 |
---|---|---|
committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-10-29 12:49:06 -0400 |
commit | fb4e95f7ea0a1f6e900f6ee1de73ec02860ff815 (patch) | |
tree | 96be2590ce94939aaae841c8a36429102f2afca9 /indra/media_plugins/base/media_plugin_base.cpp | |
parent | 1f0896c72a71797fcd924de1aab63ab5a5c893f9 (diff) | |
parent | 64c2cb6ba1c089c15df6c8ef5ec5313ed5f1897f (diff) |
Merge after pull from viewer 2.0 changes
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; |