diff options
| author | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
|---|---|---|
| committer | Aaron Stone <stone@lindenlab.com> | 2011-07-12 15:52:14 -0700 |
| commit | 450b64981c878f558b597a2855bc18318555a532 (patch) | |
| tree | d84598caf68980baa4eb3f058ada5b3ffb1c4dff /indra/newview/skins/default/xui/en/floater_web_content.xml | |
| parent | 42daa3497b6626cbb5f32ba54162558cd025069b (diff) | |
| parent | 44c7c6feaa824f4049d326965cb066e76ebefee3 (diff) | |
Merge for STORM-1482
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_web_content.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_web_content.xml | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_web_content.xml b/indra/newview/skins/default/xui/en/floater_web_content.xml index e04a72cbc0..69e6057556 100644 --- a/indra/newview/skins/default/xui/en/floater_web_content.xml +++ b/indra/newview/skins/default/xui/en/floater_web_content.xml @@ -18,6 +18,7 @@ follows="left|right|top|bottom" layout="topleft" left="5" + animate="false" name="stack1" orientation="vertical" top="20" @@ -156,14 +157,20 @@ name="external_controls" top_delta="0" user_resize="false" + auto_resize="true" width="585"> <web_browser - bottom="-22" + bottom="-2" follows="all" layout="topleft" left="0" name="webbrowser" top="0"/> + </layout_panel> + <layout_panel name="status_bar" + height="23" + auto_resize="false" + user_resize="false"> <text type="string" length="200" @@ -174,7 +181,7 @@ name="statusbartext" parse_urls="false" text_color="0.4 0.4 0.4 1" - top_pad="5" + top_pad="3" width="495"/> <progress_bar color_bar="0.3 1.0 0.3 1" |