From 7c37132bf87c0c2bf8d7d7f2b6f8624c5160e9e8 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 14 Oct 2011 00:20:24 -0700
Subject: [PATCH] EXP-1272 FIX Move "How To" to a separate web floater
---
indra/newview/app_settings/commands.xml | 3 +--
indra/newview/llviewerfloaterreg.cpp | 2 +-
indra/newview/llviewermenu.cpp | 5 +++--
indra/newview/skins/default/xui/en/floater_search.xml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 7c6468459c0..9d4d268075c 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -88,8 +88,7 @@
label_ref="Command_HowTo_Label"
tooltip_ref="Command_HowTo_Tooltip"
execute_function="Help.ToggleHowTo"
- is_running_function="Floater.IsOpen"
- is_running_parameters="help_browser"
+ is_running_function="Help.HowToVisible"
/>
<command name="inventory"
available_in_toybox="true"
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index b5ed8b04bc4..e5a80f24208 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -289,7 +289,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("snapshot", "floater_snapshot.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSnapshot>);
LLFloaterReg::add("search", "floater_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearch>);
LLFloaterReg::add("profile", "floater_web_content.xml", (LLFloaterBuildFunc)&LLFloaterWebContent::create);
- LLFloaterReg::add("how_to", "floater_web_content.xml", (LLFloaterBuildFunc)&LLFloaterWebContent::create);
+ LLFloaterReg::add("how_to", "floater_how_to.xml", (LLFloaterBuildFunc)&LLFloaterWebContent::create);
LLFloaterUIPreviewUtil::registerFloater();
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 2de70c52c7e..3dd5d26b6dd 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4526,7 +4526,7 @@ bool enable_how_to_visible(const LLSD& param)
{
LLFloaterWebContent::Params p;
p.target = "__help_how_to";
- return LLFloaterReg::instanceVisible(param, p);
+ return LLFloaterReg::instanceVisible("how_to", p);
}
class LLToolsEnableBuyOrTake : public view_listener_t
@@ -6894,9 +6894,10 @@ class LLToggleHowTo : public view_listener_t
{
LLFloaterWebContent::Params p;
p.url = gSavedSettings.getString("HowToHelpURL");
+ p.show_chrome = false;
p.target = "__help_how_to";
- LLFloaterReg::toggleInstanceOrBringToFront(userdata, p);
+ LLFloaterReg::toggleInstanceOrBringToFront("how_to", p);
return true;
}
};
diff --git a/indra/newview/skins/default/xui/en/floater_search.xml b/indra/newview/skins/default/xui/en/floater_search.xml
index b6fc7f150cc..896532e26b8 100644
--- a/indra/newview/skins/default/xui/en/floater_search.xml
+++ b/indra/newview/skins/default/xui/en/floater_search.xml
@@ -8,7 +8,7 @@
min_height="400"
min_width="500"
name="floater_web_content"
- help_topic="floater_web_content"
+ help_topic="search"
save_rect="true"
save_visibility="true"
title=""
--
GitLab