From 33eadba6ef703c1fb0a8f4bffe49ccea224fb77f Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Thu, 25 Mar 2021 18:57:30 +0200
Subject: SL-15028 Guidebook floater

---
 indra/newview/app_settings/settings.xml               | 11 +++++++++++
 indra/newview/llviewermenu.cpp                        |  5 ++---
 indra/newview/skins/default/xui/en/floater_how_to.xml | 12 +++++-------
 indra/newview/skins/default/xui/en/menu_viewer.xml    |  9 +--------
 4 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index c0166f158e..4610cd58af 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4725,6 +4725,17 @@
       <key>Value</key>
       <string>https://search.[GRID]/viewer/[CATEGORY]/?q=[QUERY]&amp;p=[AUTH_TOKEN]&amp;r=[MATURITY]&amp;lang=[LANGUAGE]&amp;g=[GODLIKE]&amp;sid=[SESSION_ID]&amp;rid=[REGION_ID]&amp;pid=[PARCEL_ID]&amp;channel=[CHANNEL]&amp;version=[VERSION]&amp;major=[VERSION_MAJOR]&amp;minor=[VERSION_MINOR]&amp;patch=[VERSION_PATCH]&amp;build=[VERSION_BUILD]</string>
     </map>
+    <key>GuidebookURL</key>
+    <map>
+      <key>Comment</key>
+      <string>URL for Guidebook content</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>https://guidebooks.secondlife.io/welcome</string>
+    </map>
     <key>HighResSnapshot</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 41122a51b1..1aa67a30cd 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -7730,12 +7730,11 @@ class LLToggleHowTo : public view_listener_t
 	bool handleEvent(const LLSD& userdata)
 	{
 		LLFloaterWebContent::Params p;
-		std::string url = gSavedSettings.getString("HowToHelpURL");
+		std::string url = gSavedSettings.getString("GuidebookURL");
 		p.url = LLWeb::expandURLSubstitutions(url, LLSD());
 		p.show_chrome = false;
-		p.target = "__help_how_to";
 		p.show_page_title = false;
-		p.preferred_media_size = LLRect(0, 460, 335, 0);
+		p.preferred_media_size = LLRect(0, 500, 300, 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
index 8c0077a8cc..b79584c7b7 100644
--- a/indra/newview/skins/default/xui/en/floater_how_to.xml
+++ b/indra/newview/skins/default/xui/en/floater_how_to.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
   legacy_header_height="18"
-  can_resize="true"
-  can_minimize="true" 
+  can_resize="false"
+  can_minimize="false"
+  can_close="false" 
   height="775"
   layout="topleft"
-  min_height="360"
-  left="10000"
-  top="10" 
+  top="0" 
   min_width="335"
   name="floater_how_to"
-  help_topic="how_to"
   single_instance="true"
   save_rect="true"
-  title="HOW TO"
+  title="WELCOME ISLAND GUIDEBOOK"
   width="780"
   filename="floater_web_content.xml"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 0d456ffe5d..456d131d9c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -1596,20 +1596,13 @@ function="World.EnvPreset"
      name="Help"
      tear_off="true">
         <menu_item_call
-         label="How to..."
+         label="Guidebook"
          name="How To"
          shortcut="F1">
             <menu_item_call.on_click
              function="Help.ToggleHowTo"
              parameter="" />
         </menu_item_call>
-        <menu_item_call
-           label="Quickstart"
-           name="Quickstart">
-            <menu_item_call.on_click
-            function="Advanced.ShowURL"
-            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
-        </menu_item_call>
 <!--        <menu_item_call
          label="Tutorial"
          name="Tutorial">
-- 
cgit v1.2.3