Skip to content
Snippets Groups Projects
Commit 5d7c3763 authored by Lynx Linden's avatar Lynx Linden
Browse files
parents a8f42e51 52d80701
Branches
Tags
No related merge requests found
...@@ -85,13 +85,22 @@ void LLFloaterHelpBrowser::onClose(bool app_quitting) ...@@ -85,13 +85,22 @@ void LLFloaterHelpBrowser::onClose(bool app_quitting)
void LLFloaterHelpBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event) void LLFloaterHelpBrowser::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
{ {
if(event == MEDIA_EVENT_LOCATION_CHANGED) switch (event)
{ {
case MEDIA_EVENT_LOCATION_CHANGED:
setCurrentURL(self->getLocation()); setCurrentURL(self->getLocation());
} break;
else if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
{ case MEDIA_EVENT_NAVIGATE_BEGIN:
// nothing yet 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 @@ ...@@ -4,8 +4,8 @@
can_resize="true" can_resize="true"
height="480" height="480"
layout="topleft" layout="topleft"
min_height="140" min_height="150"
min_width="467" min_width="500"
name="floater_help_browser" name="floater_help_browser"
help_topic="floater_help_browser" help_topic="floater_help_browser"
save_rect="true" save_rect="true"
...@@ -13,37 +13,44 @@ ...@@ -13,37 +13,44 @@
title="HELP BROWSER" title="HELP BROWSER"
width="620"> width="620">
<floater.string <floater.string
name="home_page_url"> name="loading_text">
http://www.secondlife.com Loading...
</floater.string> </floater.string>
<floater.string <floater.string
name="support_page_url"> name="done_text">
http://support.secondlife.com
</floater.string> </floater.string>
<layout_stack <layout_stack
bottom="480" bottom="480"
follows="left|right|top|bottom" follows="left|right|top|bottom"
layout="topleft" layout="topleft"
left="10" left="5"
name="stack1" name="stack1"
top="20" top="20"
width="600"> width="610">
<layout_panel <layout_panel
height="1"
layout="topleft" layout="topleft"
left_delta="0" left_delta="0"
name="external_controls"
top_delta="0" top_delta="0"
name="external_controls"
user_resize="false" user_resize="false"
width="590"> width="590">
<web_browser <web_browser
bottom="-4" bottom="-11"
follows="left|right|top|bottom" follows="left|right|top|bottom"
layout="topleft" layout="topleft"
left="0" left="0"
name="browser" name="browser"
top="0" top="0"
height="500"
width="590" /> width="590" />
<text
follows="bottom|left"
height="16"
layout="topleft"
left_delta="2"
name="status_text"
top_pad="5"
width="150" />
</layout_panel> </layout_panel>
</layout_stack> </layout_stack>
</floater> </floater>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment