From c224e589d072e733ec5b95f95b3770d5bf0584f0 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 14 Oct 2011 14:23:06 -0700
Subject: EXP-1272 FIX Move "How To" to a separate web floater added missing
 file and updated size of floater

---
 indra/llui/llfloater.cpp                              |  4 +++-
 indra/newview/llviewermenu.cpp                        |  1 +
 indra/newview/skins/default/xui/en/floater_how_to.xml | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/xui/en/floater_how_to.xml

diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index fa533e8153..d1d840729d 100644
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -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);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index cfbe32a871..10563971b3 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -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;
diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml
new file mode 100644
index 0000000000..0369ecbeff
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_how_to.xml
@@ -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"/>
\ No newline at end of file
-- 
cgit v1.2.3