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

SL-15028 Guidebook floater

meow-7.2.2
Mnikolenko Productengine 2021-03-25 18:57:30 +02:00
parent fee2c14873
commit 33eadba6ef
4 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -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>

5
indra/newview/llviewermenu.cpp
View File

@ -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;

12
indra/newview/skins/default/xui/en/floater_how_to.xml
View File

@ -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"/>

9
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -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">