diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 18:52:05 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-01 18:52:05 +0000 |
| commit | c339017d2e156a68f1e300a7668f2a9f6e6141f7 (patch) | |
| tree | c505756bca5103cd2c5fd00b9efa4c4ca57fa629 /indra/newview/llfloaterhelpbrowser.cpp | |
| parent | e5201f2bb301e7330626ae21b376de1932128dd8 (diff) | |
| parent | f0ee8af8ae832fc01aa5c79898efc72b822e40af (diff) | |
merge.
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; } } |