Skip to content
Snippets Groups Projects
Commit 5d7c3763 authored by Lynx Linden's avatar Lynx Linden
Browse files
parents a8f42e51 52d80701
No related branches found
No related tags found
No related merge requests found
......@@ -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;
}
}
......
......@@ -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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment