livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXP-1272 FIX Move "How To" to a separate web floater 

added missing file and updated size of floater
meow-7.2.2
Richard Nelson 2011-10-14 14:23:06 -07:00
parent 93ed1489a5
commit c224e589d0
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llui/llfloater.cpp
View File

@ -3048,7 +3048,9 @@ bool LLFloater::initFloaterXML(LLXMLNodePtr node, LLView *parent, const std::str
return FALSE;
}
parser.readXUI(referenced_xml, params, LLUICtrlFactory::getInstance()->getCurFileName());
Params referenced_params;
parser.readXUI(referenced_xml, referenced_params, LLUICtrlFactory::getInstance()->getCurFileName());
params.fillFrom(referenced_params);
// add children using dimensions from referenced xml for consistent layout
setShape(params.rect);

1
indra/newview/llviewermenu.cpp
View File

@ -6897,6 +6897,7 @@ class LLToggleHowTo : public view_listener_t
p.show_chrome = false;
p.target = "__help_how_to";
p.show_page_title = false;
p.preferred_media_size = LLRect(0, 460, 335, 0);
LLFloaterReg::toggleInstanceOrBringToFront("how_to", p);
return true;

17
indra/newview/skins/default/xui/en/floater_how_to.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater
legacy_header_height="18"
can_resize="true"
can_minimize="true"
height="775"
layout="topleft"
min_height="360"
left="10000"
top="10"
min_width="335"
name="floater_how_to"
single_instance="true"
save_rect="true"
title="HOW TO"
width="780"
filename="floater_web_content.xml"/>