diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 12:02:56 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-20 12:02:56 -0800 |
| commit | 67a914ebd7bd7dd13a3bf6f45a962425dba55a3b (patch) | |
| tree | ce3f6d692e2a7fb410d837aa5186f34f57c2d945 /indra/newview | |
| parent | dee57bea2526c84fb753abfd08e22c19f1cad21c (diff) | |
Fix for a couple of minor merge issues.
Diffstat (limited to 'indra/newview')
| -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(); }; |