diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterwebcontent.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llmediactrl.h | 1 | 
2 files changed, 2 insertions, 1 deletions
| diff --git a/indra/newview/llfloaterwebcontent.cpp b/indra/newview/llfloaterwebcontent.cpp index 14bd5baba1..51726112a0 100644 --- a/indra/newview/llfloaterwebcontent.cpp +++ b/indra/newview/llfloaterwebcontent.cpp @@ -312,7 +312,7 @@ void LLFloaterWebContent::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent  	else if(event == MEDIA_EVENT_PROGRESS_UPDATED )
  	{
  		int percent = (int)self->getProgressPercent();
 -		mStatusBarProgress->setPercent( percent );
 +		mStatusBarProgress->setValue( percent );
  	}
  	else if(event == MEDIA_EVENT_NAME_CHANGED )
  	{
 diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h index f95592551c..38a74f90d3 100644 --- a/indra/newview/llmediactrl.h +++ b/indra/newview/llmediactrl.h @@ -62,6 +62,7 @@ public:  		Optional<LLUIColor>		caret_color;  		Optional<std::string>	initial_mime_type; +		Optional<std::string>	media_id;  		Params();  	}; | 
