diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-02 12:17:29 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-02 12:17:29 +0200 |
| commit | 9b0518dd8e46dfe74eaa0f7622b1486dbde32b82 (patch) | |
| tree | 2c637ad3b5a5cfa8ec1e97c30c3de9efe5cac59b /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | 7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (diff) | |
| parent | 4ad357ec70e15afdfe78816990cb23c7ba17619c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterhelpbrowser.cpp')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp index 2e0ae3265e..f3c6b286ab 100644 --- a/indra/newview/llfloaterhelpbrowser.cpp +++ b/indra/newview/llfloaterhelpbrowser.cpp @@ -85,13 +85,22 @@ void LLFloaterHelpBrowser::onClose(bool app_quitting) void LLFloaterHelpBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) { - if(event == MEDIA_EVENT_LOCATION_CHANGED) + switch (event) { + case MEDIA_EVENT_LOCATION_CHANGED: setCurrentURL(self->getLocation()); - } - else if(event == MEDIA_EVENT_NAVIGATE_COMPLETE) - { - // nothing yet + break; + + case MEDIA_EVENT_NAVIGATE_BEGIN: + childSetText("status_text", getString("loading_text")); + break; + + case MEDIA_EVENT_NAVIGATE_COMPLETE: + childSetText("status_text", getString("done_text")); + break; + + default: + break; } } |