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 | |
| parent | e5201f2bb301e7330626ae21b376de1932128dd8 (diff) | |
| parent | f0ee8af8ae832fc01aa5c79898efc72b822e40af (diff) | |
merge.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 19 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_help_browser.xml | 29 |
3 files changed, 33 insertions, 16 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; } } diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index e04d3ec5a0..e8a4899a0b 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -4634,6 +4634,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { case LLAssetType::AT_CLOTHING: items.push_back(std::string("Take Off")); + // Fallthrough since clothing and bodypart share wear options case LLAssetType::AT_BODYPART: if (get_is_item_worn(item->getUUID())) { diff --git a/indra/newview/skins/default/xui/en/floater_help_browser.xml b/indra/newview/skins/default/xui/en/floater_help_browser.xml index e83bc1555c..be32e917e5 100644 --- a/indra/newview/skins/default/xui/en/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_help_browser.xml @@ -4,8 +4,8 @@ can_resize="true" height="480" layout="topleft" - min_height="140" - min_width="467" + min_height="150" + min_width="500" name="floater_help_browser" help_topic="floater_help_browser" save_rect="true" @@ -13,37 +13,44 @@ title="HELP BROWSER" width="620"> <floater.string - name="home_page_url"> - http://www.secondlife.com + name="loading_text"> + Loading... </floater.string> <floater.string - name="support_page_url"> - http://support.secondlife.com + name="done_text"> </floater.string> <layout_stack bottom="480" follows="left|right|top|bottom" layout="topleft" - left="10" + left="5" name="stack1" top="20" - width="600"> + width="610"> <layout_panel - height="1" layout="topleft" left_delta="0" - name="external_controls" top_delta="0" + name="external_controls" user_resize="false" width="590"> <web_browser - bottom="-4" + bottom="-11" follows="left|right|top|bottom" layout="topleft" left="0" name="browser" top="0" + height="500" width="590" /> + <text + follows="bottom|left" + height="16" + layout="topleft" + left_delta="2" + name="status_text" + top_pad="5" + width="150" /> </layout_panel> </layout_stack> </floater> |