Merge pull request #6357 from secondlife/pepper/chat-merge-26.5

Merge `release/26.5` into `project/chat-modernization`

1 files changed, 8 insertions, 0 deletions

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 2269d7adc8..540bd77b7d 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -1309,8 +1309,16 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
         else if (message_name == "file_download")
         {
             mFileDownloadFilename = message.getValue("filename");
+            mFileDownloadProgressPercent = 0;
+            mFileDownloadProgressComplete = false;
             mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_FILE_DOWNLOAD);
         }
+        else if (message_name == "file_download_progress")
+        {
+            mFileDownloadProgressPercent = message.getValueS32("percent");
+            mFileDownloadProgressComplete = message.getValueBoolean("complete");
+            mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_FILE_DOWNLOAD_PROGRESS);
+        }
         else if(message_name == "debug_message")
         {
             mDebugMessageText = message.getValue("message_text");