diff options
| author | Maycon Bekkers <mayconbekkers@gmail.com> | 2026-04-14 17:13:36 -0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2026-04-21 21:51:59 +0300 |
| commit | e03869c4482bdfab1b8b5a3170f96bcd8c4e2a3a (patch) | |
| tree | 0bfd65504b779e096948f22b2a7eaaf78cc12b71 | |
| parent | 5e38c19d87e032c20295915445d18743c4ccb611 (diff) | |
Remove Guidebook entry points
46 files changed, 1 insertions, 385 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 1d1553355e..17d344a330 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -243,7 +243,6 @@ set(viewer_SOURCE_FILES llfloaterhandler.cpp llfloaterhelpbrowser.cpp llfloaterhoverheight.cpp - llfloaterhowto.cpp llfloaterhud.cpp llfloaterimagepreview.cpp llfloaterimsessiontab.cpp @@ -923,7 +922,6 @@ set(viewer_HEADER_FILES llfloaterhandler.h llfloaterhelpbrowser.h llfloaterhoverheight.h - llfloaterhowto.h llfloaterhud.h llfloaterimagepreview.h llfloaterimnearbychat.h @@ -2496,4 +2494,3 @@ if (LL_TESTS) endif (LL_TESTS) check_message_template(${VIEWER_BINARY_NAME}) - diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index 7bcfecf9fa..952818144d 100644 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -83,16 +83,6 @@ is_running_function="Floater.IsOpen" is_running_parameters="gestures" /> - <command name="howto" - available_in_toybox="true" - icon="Command_HowTo_Icon" - label_ref="Command_HowTo_Label" - tooltip_ref="Command_HowTo_Tooltip" - execute_function="Floater.ToggleOrBringToFront" - execute_parameters="guidebook" - is_running_function="Floater.IsOpen" - is_running_parameters="guidebook" - /> <command name="inventory" available_in_toybox="true" icon="Command_Inventory_Icon" diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 045308c743..7c98572d07 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3445,17 +3445,6 @@ <key>Value</key> <string>https://viewer-help.secondlife.com/[LANGUAGE]/[CHANNEL]/[VERSION]/[TOPIC][DEBUG_MODE]</string> </map> - <key>HowToHelpURL</key> - <map> - <key>Comment</key> - <string>URL for How To help content</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>String</string> - <key>Value</key> - <string>https://lecs-viewer-web-components.s3.amazonaws.com/v3.0/[GRID_LOWERCASE]/howto/index.html</string> - </map> <key>HomeSidePanelURL</key> <map> <key>Comment</key> @@ -3478,17 +3467,6 @@ <key>Value</key> <string>https://search.[GRID]/viewer/?query_term=[QUERY]&search_type=[TYPE][COLLECTION]&maturity=[MATURITY]&lang=[LANGUAGE]&g=[GODLIKE]&sid=[SESSION_ID]&rid=[REGION_ID]&pid=[PARCEL_ID]&channel=[CHANNEL]&version=[VERSION]&major=[VERSION_MAJOR]&minor=[VERSION_MINOR]&patch=[VERSION_PATCH]&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>http://guidebooks.secondlife.io/welcome/index.html</string> - </map> <key>HighResSnapshot</key> <map> <key>Comment</key> diff --git a/indra/newview/app_settings/toolbars.xml b/indra/newview/app_settings/toolbars.xml index a1c9d6d9ee..f22c25f3a2 100644 --- a/indra/newview/app_settings/toolbars.xml +++ b/indra/newview/app_settings/toolbars.xml @@ -10,7 +10,6 @@ <command name="map"/> <command name="move"/> <command name="view"/> - <command name="howto"/> </bottom_toolbar> <left_toolbar button_display_mode="icons_only"> diff --git a/indra/newview/llfloaterhowto.cpp b/indra/newview/llfloaterhowto.cpp deleted file mode 100644 index 6a9f113d53..0000000000 --- a/indra/newview/llfloaterhowto.cpp +++ /dev/null @@ -1,92 +0,0 @@ -/** - * @file llfloaterhowto.cpp - * @brief A variant of web floater meant to open guidebook - * - * $LicenseInfo:firstyear=2021&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2021, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloaterhowto.h" - -#include "llfloaterreg.h" -#include "llviewercontrol.h" -#include "llweb.h" - - -constexpr S32 STACK_WIDTH = 300; -constexpr S32 STACK_HEIGHT = 505; // content will be 500 - -LLFloaterHowTo::LLFloaterHowTo(const Params& key) : - LLFloaterWebContent(key) -{ - mShowPageTitle = false; -} - -bool LLFloaterHowTo::postBuild() -{ - LLFloaterWebContent::postBuild(); - - return true; -} - -void LLFloaterHowTo::onOpen(const LLSD& key) -{ - LLFloaterWebContent::Params p(key); - if (!p.url.isProvided() || p.url.getValue().empty()) - { - std::string url = gSavedSettings.getString("GuidebookURL"); - p.url = LLWeb::expandURLSubstitutions(url, LLSD()); - } - p.show_chrome = false; - - LLFloaterWebContent::onOpen(p); - - if (p.preferred_media_size().isEmpty()) - { - // Elements from LLFloaterWebContent did not pick up restored size (save_rect) of LLFloaterHowTo - // set the stack size and position (alternative to preferred_media_size) - LLLayoutStack *stack = getChild<LLLayoutStack>("stack1"); - LLRect stack_rect = stack->getRect(); - stack->reshape(STACK_WIDTH, STACK_HEIGHT); - stack->setOrigin(stack_rect.mLeft, stack_rect.mTop - STACK_HEIGHT); - stack->updateLayout(); - } -} - -LLFloaterHowTo* LLFloaterHowTo::getInstance() -{ - return LLFloaterReg::getTypedInstance<LLFloaterHowTo>("guidebook"); -} - -bool LLFloaterHowTo::handleKeyHere(KEY key, MASK mask) -{ - bool handled = false; - - if (KEY_F1 == key ) - { - closeFloater(); - handled = true; - } - - return handled; -} diff --git a/indra/newview/llfloaterhowto.h b/indra/newview/llfloaterhowto.h deleted file mode 100644 index 9d7793817a..0000000000 --- a/indra/newview/llfloaterhowto.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @file llfloaterhowto.h - * @brief A variant of web floater meant to open guidebook - * - * $LicenseInfo:firstyear=2021&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2021, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLFLOATERHOWTO_H -#define LL_LLFLOATERHOWTO_H - -#include "llfloaterwebcontent.h" - -class LLMediaCtrl; - - -class LLFloaterHowTo : - public LLFloaterWebContent -{ -public: - LOG_CLASS(LLFloaterHowTo); - - typedef LLFloaterWebContent::Params Params; - - LLFloaterHowTo(const Params& key); - - void onOpen(const LLSD& key) override; - - bool handleKeyHere(KEY key, MASK mask) override; - - static LLFloaterHowTo* getInstance(); - - bool matchesKey(const LLSD& key) override { return true; /*single instance*/ }; - -private: - bool postBuild() override; -}; - -#endif // LL_LLFLOATERHOWTO_H - diff --git a/indra/newview/llurlfloaterdispatchhandler.cpp b/indra/newview/llurlfloaterdispatchhandler.cpp index 9bee4870be..cf0657ea2f 100644 --- a/indra/newview/llurlfloaterdispatchhandler.cpp +++ b/indra/newview/llurlfloaterdispatchhandler.cpp @@ -29,15 +29,9 @@ #include "llurlfloaterdispatchhandler.h" #include "llfloaterreg.h" -#include "llfloaterhowto.h" #include "llfloaterwebcontent.h" #include "llsdserialize.h" -#include "llviewercontrol.h" #include "llviewergenericmessage.h" -#include "llweb.h" - -// Example: -// llOpenFloater("guidebook", "http://page.com", []); // values specified by server side's dispatcher // for llopenfloater @@ -50,20 +44,12 @@ const std::string KEY_URL("floater_url"); const std::string KEY_PARAMS("floater_params"); // Supported floaters -const std::string FLOATER_GUIDEBOOK("guidebook"); -const std::string FLOATER_HOW_TO("how_to"); // alias for guidebook const std::string FLOATER_WEB_CONTENT("web_content"); // All arguments are palceholders! Server side will need to add validation first. // Web content universal argument const std::string KEY_TRUSTED_CONTENT("trusted_content"); -// Guidebook specific arguments -const std::string KEY_WIDTH("width"); -const std::string KEY_HEGHT("height"); -const std::string KEY_CAN_CLOSE("can_close"); -const std::string KEY_TITLE("title"); - // web_content specific arguments const std::string KEY_SHOW_PAGE_TITLE("show_page_title"); const std::string KEY_ALLOW_ADRESS_ENTRY("allow_address_entry"); // It is not recomended to set this to true if trusted content is allowed @@ -143,48 +129,7 @@ bool LLUrlFloaterDispatchHandler::operator()(const LLDispatcher *, const std::st LLFloaterWebContent::Params params; params.url = url; - if (floater == FLOATER_GUIDEBOOK || floater == FLOATER_HOW_TO) - { - LL_DEBUGS("URLFloater") << "Opening how_to floater with parameters: " << message << LL_ENDL; - if (command_params.isMap()) // by default is undefines - { - params.trusted_content = command_params.has(KEY_TRUSTED_CONTENT) ? command_params[KEY_TRUSTED_CONTENT].asBoolean() : false; - - // Script's side argument list can't include other lists, neither - // there is a LLRect type, so expect just width and height - if (command_params.has(KEY_WIDTH) && command_params.has(KEY_HEGHT)) - { - LLRect rect(0, command_params[KEY_HEGHT].asInteger(), command_params[KEY_WIDTH].asInteger(), 0); - params.preferred_media_size.setValue(rect); - } - } - - // Some locations will have customized guidebook, which this function easists for - // only one instance of guidebook can exist at a time, so if this command arrives, - // we need to close previous guidebook then reopen it. - - LLFloater* instance = LLFloaterReg::findInstance("guidebook"); - if (instance) - { - instance->closeHostedFloater(); - } - - LLFloaterReg::toggleInstanceOrBringToFront("guidebook", params); - - if (command_params.isMap()) - { - LLFloater* instance = LLFloaterReg::findInstance("guidebook"); - if (command_params.has(KEY_CAN_CLOSE)) - { - instance->setCanClose(command_params[KEY_CAN_CLOSE].asBoolean()); - } - if (command_params.has(KEY_TITLE)) - { - instance->setTitle(command_params[KEY_TITLE].asString()); - } - } - } - else if (floater == FLOATER_WEB_CONTENT) + if (floater == FLOATER_WEB_CONTENT) { LL_DEBUGS("URLFloater") << "Opening web_content floater with parameters: " << message << LL_ENDL; if (command_params.isMap()) // by default is undefines, might be better idea to init params from command_params diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 82fc4c6d87..eef31c7048 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -85,7 +85,6 @@ #include "llfloatergroups.h" #include "llfloaterhelpbrowser.h" #include "llfloaterhoverheight.h" -#include "llfloaterhowto.h" #include "llfloaterhud.h" #include "llfloaterimagepreview.h" #include "llfloaterimsession.h" @@ -503,7 +502,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("search", "floater_search.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSearch>); LLFloaterReg::add("legacy_search", "floater_directory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDirectory>); LLFloaterReg::add("profile", "floater_profile.xml",(LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterProfile>); - LLFloaterReg::add("guidebook", "floater_how_to.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHowTo>); LLFloaterReg::add("slapp_test", "floater_test_slapp.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSLappTest>); LLFloaterUIPreviewUtil::registerFloater(); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dbcf4fbbf4..8d6b8ec713 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8504,15 +8504,6 @@ class LLToolsEnableSaveToObjectInventory : public view_listener_t } }; -class LLToggleHowTo : public view_listener_t -{ - bool handleEvent(const LLSD& userdata) - { - LLFloaterReg::toggleInstanceOrBringToFront("guidebook"); - return true; - } -}; - class LLViewEnableMouselook : public view_listener_t { bool handleEvent(const LLSD& userdata) @@ -9964,10 +9955,6 @@ void initialize_menus() view_listener_t::addMenu(new LLToolsEnablePathfindingRebakeRegion(), "Tools.EnablePathfindingRebakeRegion"); view_listener_t::addMenu(new LLToolsCheckSelectionLODMode(), "Tools.ToolsCheckSelectionLODMode"); - // Help menu - // most items use the ShowFloater method - view_listener_t::addMenu(new LLToggleHowTo(), "Help.ToggleHowTo"); - // Advanced menu view_listener_t::addMenu(new LLAdvancedToggleConsole(), "Advanced.ToggleConsole"); view_listener_t::addMenu(new LLAdvancedCheckConsole(), "Advanced.CheckConsole"); diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index ff5737ab49..faf2bd9434 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -141,7 +141,6 @@ with the same filename but different name <texture name="Command_Destinations_Icon" file_name="toolbar_icons/destinations.png" preload="true" /> <texture name="Command_Gestures_Icon" file_name="toolbar_icons/gestures.png" preload="true" /> <texture name="Command_Grid_Status_Icon" file_name="toolbar_icons/grid_status.png" preload="true" /> - <texture name="Command_HowTo_Icon" file_name="toolbar_icons/howto.png" preload="true" /> <texture name="Command_Inventory_Icon" file_name="toolbar_icons/inventory.png" preload="true" /> <texture name="Command_Map_Icon" file_name="toolbar_icons/map.png" preload="true" /> <texture name="Command_Marketplace_Icon" file_name="toolbar_icons/marketplace.png" preload="true" /> diff --git a/indra/newview/skins/default/textures/toolbar_icons/howto.png b/indra/newview/skins/default/textures/toolbar_icons/howto.png Binary files differdeleted file mode 100644 index 8594d71113..0000000000 --- a/indra/newview/skins/default/textures/toolbar_icons/howto.png +++ /dev/null diff --git a/indra/newview/skins/default/xui/de/floater_how_to.xml b/indra/newview/skins/default/xui/de/floater_how_to.xml deleted file mode 100644 index caea221f83..0000000000 --- a/indra/newview/skins/default/xui/de/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="INFOS"/> diff --git a/indra/newview/skins/default/xui/de/notifications.xml b/indra/newview/skins/default/xui/de/notifications.xml index 6ad71e0ad1..40b34d99ba 100644 --- a/indra/newview/skins/default/xui/de/notifications.xml +++ b/indra/newview/skins/default/xui/de/notifications.xml @@ -1127,7 +1127,6 @@ Falls Sie [SECOND_LIFE] zum ersten Mal verwenden, müssen Sie zuerst ein Konto e Ihr Avatar erscheint jeden Moment. Benutzen Sie die Pfeiltasten, um sich fortzubewegen. -Drücken Sie F1 für Hilfe oder für weitere Informationen über [SECOND_LIFE]. Bitte wählen Sie einen männlichen oder weiblichen Avatar. Sie können sich später noch umentscheiden. <usetemplate name="okcancelbuttons" notext="Weiblich" yestext="Männlich"/> diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml index d7b2ee57a8..bd26672ccf 100644 --- a/indra/newview/skins/default/xui/de/strings.xml +++ b/indra/newview/skins/default/xui/de/strings.xml @@ -5537,9 +5537,6 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Grid_Status_Label"> Grid-Status </string> - <string name="Command_HowTo_Label"> - Infos - </string> <string name="Command_Inventory_Label"> Inventar </string> @@ -5636,9 +5633,6 @@ Setzen Sie den Editorpfad in Anführungszeichen <string name="Command_Grid_Status_Tooltip"> Aktuellen Grid-Status anzeigen </string> - <string name="Command_HowTo_Tooltip"> - Wie führe ich gängige Aufgaben aus? - </string> <string name="Command_Inventory_Tooltip"> Ihr Eigentum anzeigen und benutzen </string> diff --git a/indra/newview/skins/default/xui/en/floater_how_to.xml b/indra/newview/skins/default/xui/en/floater_how_to.xml deleted file mode 100644 index 5b00d23faa..0000000000 --- a/indra/newview/skins/default/xui/en/floater_how_to.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater - legacy_header_height="18" - can_resize="false" - can_minimize="false" - height="525" - layout="topleft" - name="floater_how_to" - single_instance="true" - save_visibility="true" - save_rect="true" - title="WELCOME ISLAND GUIDEBOOK" - width="310" - rel_x="-0.469309" - rel_y="-0.011166" - filename="floater_web_content.xml"/> diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml index 5fff9b7bc0..de967d25e3 100644 --- a/indra/newview/skins/default/xui/en/menu_login.xml +++ b/indra/newview/skins/default/xui/en/menu_login.xml @@ -57,15 +57,6 @@ tear_off="true" name="Help"> <menu_item_call - label="Guidebook" - name="How To" - shortcut="F1"> - <menu_item_call.on_click - function="Help.ToggleHowTo" - parameter="" /> - </menu_item_call> - <menu_item_separator/> - <menu_item_call label="Knowledge Base" name="Knowledge Base"> <menu_item_call.on_click diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index ffe4bcebd5..f7541f52ad 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1804,14 +1804,6 @@ function="World.EnvPreset" label="Help" name="Help" tear_off="true"> - <menu_item_call - label="Guidebook" - name="How To" - shortcut="F1"> - <menu_item_call.on_click - function="Help.ToggleHowTo" - parameter="" /> - </menu_item_call> <!-- <menu_item_call label="Tutorial" name="Tutorial"> @@ -1819,7 +1811,6 @@ function="World.EnvPreset" function="Floater.Show" parameter="hud" /> </menu_item_call>--> - <menu_item_separator/> <menu_item_call label="Knowledge Base" name="Knowledge Base"> diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 27846c8d7c..221bac329d 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -3950,7 +3950,6 @@ Local Data you are deleting is shared between multiple grids, are you sure you w Your character will appear in a moment. Use arrow keys to walk. -Press the F1 key at any time for help or to learn more about [SECOND_LIFE]. Please choose the male or female avatar. You can change your mind later. <usetemplate name="okcancelbuttons" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index e022f29b76..6a123d2a2a 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -4202,7 +4202,6 @@ name="Command_360_Capture_Label">360 snapshot</string> <string name="Command_Environments_Label">My Environments</string> <string name="Command_Gestures_Label">Gestures</string> <string name="Command_Grid_Status_Label">Grid status</string> - <string name="Command_HowTo_Label">Guidebook</string> <string name="Command_Inventory_Label">Inventory</string> <string name="Command_Map_Label">Map</string> <string name="Command_Marketplace_Label">Marketplace</string> @@ -4235,7 +4234,6 @@ name="Command_360_Capture_Tooltip">Capture a 360 equirectangular image</string> <string name="Command_Environments_Tooltip">My Environments</string> <string name="Command_Gestures_Tooltip">Gestures for your avatar</string> <string name="Command_Grid_Status_Tooltip">Show current Grid status</string> - <string name="Command_HowTo_Tooltip">How to do common tasks</string> <string name="Command_Inventory_Tooltip">View and use your belongings</string> <string name="Command_Map_Tooltip">Map of the world</string> <string name="Command_Marketplace_Tooltip">Go shopping</string> diff --git a/indra/newview/skins/default/xui/es/floater_how_to.xml b/indra/newview/skins/default/xui/es/floater_how_to.xml deleted file mode 100644 index 4a57dc3643..0000000000 --- a/indra/newview/skins/default/xui/es/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="CÓMO"/> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index 739391b965..5dee9eb3a8 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1119,7 +1119,6 @@ Puedes revisar tu conexión a Internet y volver a intentarlo en unos minutos, pu Tu personaje aparecerá en un momento. Para caminar, usa las teclas del cursor. -En cualquier momento, puedes pulsar la tecla F1 para conseguir ayuda o para aprender más acerca de [SECOND_LIFE]. Por favor, elige el avatar masculino o femenino. Puedes cambiar más adelante tu elección. <usetemplate name="okcancelbuttons" notext="Mujer" yestext="Varón"/> diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml index 86e454b83e..1bfab01108 100644 --- a/indra/newview/skins/default/xui/es/strings.xml +++ b/indra/newview/skins/default/xui/es/strings.xml @@ -5439,9 +5439,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Command_Grid_Status_Label"> Estado del Grid </string> - <string name="Command_HowTo_Label"> - Cómo - </string> <string name="Command_Inventory_Label"> Inventario </string> @@ -5538,9 +5535,6 @@ Inténtalo incluyendo la ruta de acceso al editor entre comillas <string name="Command_Grid_Status_Tooltip"> Mostrar el estado actual del Grid </string> - <string name="Command_HowTo_Tooltip"> - Cómo hacer las tareas habituales - </string> <string name="Command_Inventory_Tooltip"> Ver y usar tus pertenencias </string> diff --git a/indra/newview/skins/default/xui/fr/floater_how_to.xml b/indra/newview/skins/default/xui/fr/floater_how_to.xml deleted file mode 100644 index a414212ba0..0000000000 --- a/indra/newview/skins/default/xui/fr/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="AIDE RAPIDE"/> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 587c88faad..9c79f288c1 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -1109,7 +1109,6 @@ Vérifiez votre connexion Internet et réessayez dans quelques minutes, cliquez Votre personnage va apparaître dans un moment. Pour marcher, utilisez les flèches de direction. -Appuyez sur F1 pour obtenir de l'aide ou en savoir plus sur [SECOND_LIFE]. Choisissez un avatar homme ou femme. Vous pourrez revenir sur votre décision plus tard. <usetemplate name="okcancelbuttons" notext="Femme" yestext="Homme"/> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 4fb5167d67..4a7a337d4c 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -5538,9 +5538,6 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Command_Grid_Status_Label"> État de la grille </string> - <string name="Command_HowTo_Label"> - Aide rapide - </string> <string name="Command_Inventory_Label"> Inventaire </string> @@ -5637,9 +5634,6 @@ Essayez avec le chemin d'accès à l'éditeur entre guillemets doubles <string name="Command_Grid_Status_Tooltip"> Afficher l’état actuel de la grille </string> - <string name="Command_HowTo_Tooltip"> - Comment effectuer les opérations courantes - </string> <string name="Command_Inventory_Tooltip"> Afficher et utiliser vos possessions </string> diff --git a/indra/newview/skins/default/xui/it/floater_how_to.xml b/indra/newview/skins/default/xui/it/floater_how_to.xml deleted file mode 100644 index 8f0e210571..0000000000 --- a/indra/newview/skins/default/xui/it/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="ISTRUZIONI"/> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index f79cc1515b..284f947b18 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -1115,7 +1115,6 @@ Controlla la tua connessione Internet e riprova fra qualche minuto, oppure clicc Il tuo avatar apparirà fra un attimo. Usa le frecce per muoverti. -Premi F1 in qualunque momento per la guida o per apprendere altre cose di [SECOND_LIFE]. Scegli un avatar maschile o femminile. Puoi sempre cambiare idea più tardi. <usetemplate name="okcancelbuttons" notext="Femminile" yestext="Maschile"/> </notification> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 2ddb7d77d1..b4d6b2a315 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -5453,9 +5453,6 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Command_Grid_Status_Label"> Stato della griglia </string> - <string name="Command_HowTo_Label"> - Istruzioni - </string> <string name="Command_Inventory_Label"> Inventario </string> @@ -5552,9 +5549,6 @@ Prova a racchiudere il percorso dell'editor in doppie virgolette. <string name="Command_Grid_Status_Tooltip"> Mostra stato griglia corrente </string> - <string name="Command_HowTo_Tooltip"> - Come eseguire le attività più comuni - </string> <string name="Command_Inventory_Tooltip"> Visualizza e usa le tue cose </string> diff --git a/indra/newview/skins/default/xui/ja/floater_how_to.xml b/indra/newview/skins/default/xui/ja/floater_how_to.xml deleted file mode 100644 index 480fb4649c..0000000000 --- a/indra/newview/skins/default/xui/ja/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="ウェルカムアイランドガイドブック" filename="floater_web_content.xml"/>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/ja/notifications.xml b/indra/newview/skins/default/xui/ja/notifications.xml index 9ec7a0de98..07d6c41213 100644 --- a/indra/newview/skins/default/xui/ja/notifications.xml +++ b/indra/newview/skins/default/xui/ja/notifications.xml @@ -2162,7 +2162,6 @@ https://wiki.secondlife.com/wiki/Adding_Spelling_Dictionaries </form> </notification> <notification name="WelcomeChooseSex">まもなく、あなたのアバターが表示されます。矢印キーを使用して歩きます。 -ヘルプが必要なときや、[SECOND_LIFE]について知りたいときは、F1キーを押してください。 男性あるいは女性のアバターを選択してください。この設定は後で変更できます。 <tag> confirm diff --git a/indra/newview/skins/default/xui/ja/strings.xml b/indra/newview/skins/default/xui/ja/strings.xml index 7d618bc337..a67e58a42a 100644 --- a/indra/newview/skins/default/xui/ja/strings.xml +++ b/indra/newview/skins/default/xui/ja/strings.xml @@ -7143,9 +7143,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Command_Grid_Status_Label"> グリッド状況 </string> - <string name="Command_HowTo_Label"> - ハウツー - </string> <string name="Command_Inventory_Label"> インベントリ </string> @@ -7233,9 +7230,6 @@ www.secondlife.com から最新バージョンをダウンロードしてくだ <string name="Command_Grid_Status_Tooltip"> 現在のグリッドステータスを表示します。 </string> - <string name="Command_HowTo_Tooltip"> - 一般的タスクの実行方法を表示します。 - </string> <string name="Command_Inventory_Tooltip"> インベントリの内容を表示したり使用したりします。 </string> diff --git a/indra/newview/skins/default/xui/pl/floater_how_to.xml b/indra/newview/skins/default/xui/pl/floater_how_to.xml deleted file mode 100644 index 2c412de30a..0000000000 --- a/indra/newview/skins/default/xui/pl/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<floater name="floater_how_to" title="SAMOUCZEK" /> diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index ad9d2ecf1d..a8ea3c7c1a 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -1397,7 +1397,6 @@ Możesz sprawdzić swoje połączenie z Internetem i spróbować ponownie za kil Twoja postać pojawi się za moment. Używaj strzałek żeby się poruszać. -Naciśnij F1 w dowolnej chwili po pomoc albo żeby dowiedzieć się więcej o [SECOND_LIFE]. Wybierz awatara właściwej płci. Ten wybór będzie można później zmienić. <usetemplate name="okcancelbuttons" notext="Kobieta" yestext="Mężczyzna" /> </notification> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index 7a61878618..dc7ca53aaa 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -4992,9 +4992,6 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu. <string name="Command_Grid_Status_Label"> Status świata </string> - <string name="Command_HowTo_Label"> - Samouczek - </string> <string name="Command_Inventory_Label"> Szafa </string> @@ -5076,9 +5073,6 @@ Spróbuj załączyć ścieżkę do edytora w cytowaniu. <string name="Command_Grid_Status_Tooltip"> Pokaż obecny status świata </string> - <string name="Command_HowTo_Tooltip"> - Jak wykonywać zwyczajne rzeczy - </string> <string name="Command_Inventory_Tooltip"> Przeglądaj i używaj rzeczy, jakie należą do Ciebie </string> diff --git a/indra/newview/skins/default/xui/pt/floater_how_to.xml b/indra/newview/skins/default/xui/pt/floater_how_to.xml deleted file mode 100644 index 15c4946cb0..0000000000 --- a/indra/newview/skins/default/xui/pt/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="COMO"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index a3220bca54..153109fc1b 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1108,7 +1108,6 @@ Cheque sua conexão e tente em alguns minutos, clique na Ajuda para acessar o [S Seu personagem irá aparecer num momento. Use as teclas de seta para andar. -Pressione a tecla F1 para ajuda ou aprender mais sobre [SECOND_LIFE]. Por favor, escolha se o seu avatar é feminino ou masculino. Você pode mudar de idéia depois. <usetemplate name="okcancelbuttons" notext="Feminino" yestext="Masculino"/> </notification> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 543fd45573..3d03a71e81 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -5406,9 +5406,6 @@ Tente colocar o caminho do editor entre aspas. <string name="Command_Grid_Status_Label"> Status da grade </string> - <string name="Command_HowTo_Label"> - Como - </string> <string name="Command_Inventory_Label"> Inventário </string> @@ -5505,9 +5502,6 @@ Tente colocar o caminho do editor entre aspas. <string name="Command_Grid_Status_Tooltip"> Mostrar status da grade atual </string> - <string name="Command_HowTo_Tooltip"> - Como executar tarefas comuns - </string> <string name="Command_Inventory_Tooltip"> Exibir e usar seus pertences </string> diff --git a/indra/newview/skins/default/xui/ru/floater_how_to.xml b/indra/newview/skins/default/xui/ru/floater_how_to.xml deleted file mode 100644 index 52525e5d33..0000000000 --- a/indra/newview/skins/default/xui/ru/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="ПОМОЩЬ"/> diff --git a/indra/newview/skins/default/xui/ru/notifications.xml b/indra/newview/skins/default/xui/ru/notifications.xml index e75fd1fd82..96eb917e39 100644 --- a/indra/newview/skins/default/xui/ru/notifications.xml +++ b/indra/newview/skins/default/xui/ru/notifications.xml @@ -1459,7 +1459,6 @@ Ваш персонаж появится через мгновение. Для ходьбы нажимайте клавиши со стрелками. -В любой момент можно нажать клавишу F1 для получения справки или информации о [SECOND_LIFE]. Выберите мужской или женский аватар. Этот выбор затем можно будет изменить. <usetemplate name="okcancelbuttons" notext="Женщина" yestext="Мужчина"/> </notification> diff --git a/indra/newview/skins/default/xui/ru/strings.xml b/indra/newview/skins/default/xui/ru/strings.xml index 8433f893b5..86973c6ae7 100644 --- a/indra/newview/skins/default/xui/ru/strings.xml +++ b/indra/newview/skins/default/xui/ru/strings.xml @@ -5544,9 +5544,6 @@ support@secondlife.com. <string name="Command_Grid_Status_Label"> Состояние сетки </string> - <string name="Command_HowTo_Label"> - Инструкции - </string> <string name="Command_Inventory_Label"> Инвентарь </string> @@ -5643,9 +5640,6 @@ support@secondlife.com. <string name="Command_Grid_Status_Tooltip"> Показать текущее состояние сетки </string> - <string name="Command_HowTo_Tooltip"> - Выполнение типичных задач - </string> <string name="Command_Inventory_Tooltip"> Просмотр и использование вашего имущества </string> diff --git a/indra/newview/skins/default/xui/tr/floater_how_to.xml b/indra/newview/skins/default/xui/tr/floater_how_to.xml deleted file mode 100644 index a42fe0b122..0000000000 --- a/indra/newview/skins/default/xui/tr/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="NASIL YAPILIR"/> diff --git a/indra/newview/skins/default/xui/tr/notifications.xml b/indra/newview/skins/default/xui/tr/notifications.xml index 17d2969d19..de429f3292 100644 --- a/indra/newview/skins/default/xui/tr/notifications.xml +++ b/indra/newview/skins/default/xui/tr/notifications.xml @@ -1460,7 +1460,6 @@ Yeni bir ana konum ayarlamak isteyebilirsiniz. Karakteriniz birazdan görünecek. Yürümek için ok tuşlarını kullanın. -Yardım almak ya da [SECOND_LIFE] hakkında daha fazla bilgi edinmek için istediğiniz zaman F1 tuşuna basın. Lütfen bir erkek ya da kadın avatar seçin. Fikrinizi daha sonra değiştirebilirsiniz. <usetemplate name="okcancelbuttons" notext="Kadın" yestext="Erkek"/> </notification> diff --git a/indra/newview/skins/default/xui/tr/strings.xml b/indra/newview/skins/default/xui/tr/strings.xml index e68d000179..3eaa6a6492 100644 --- a/indra/newview/skins/default/xui/tr/strings.xml +++ b/indra/newview/skins/default/xui/tr/strings.xml @@ -5539,9 +5539,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Command_Grid_Status_Label"> Ağ durumu </string> - <string name="Command_HowTo_Label"> - Nasıl yapılır - </string> <string name="Command_Inventory_Label"> Envanter </string> @@ -5638,9 +5635,6 @@ Düzenleyici yolunu çift tırnakla çevrelemeyi deneyin. <string name="Command_Grid_Status_Tooltip"> Ağın mevcut durumunu göster </string> - <string name="Command_HowTo_Tooltip"> - Genel görevleri nasıl yapacağınız - </string> <string name="Command_Inventory_Tooltip"> Eşyalarınızı görüntüleyin ve kullanın </string> diff --git a/indra/newview/skins/default/xui/zh/floater_how_to.xml b/indra/newview/skins/default/xui/zh/floater_how_to.xml deleted file mode 100644 index e033327165..0000000000 --- a/indra/newview/skins/default/xui/zh/floater_how_to.xml +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_how_to" title="簡易教學"/> diff --git a/indra/newview/skins/default/xui/zh/notifications.xml b/indra/newview/skins/default/xui/zh/notifications.xml index 4d0f1cb85b..fd0b613dd6 100644 --- a/indra/newview/skins/default/xui/zh/notifications.xml +++ b/indra/newview/skins/default/xui/zh/notifications.xml @@ -1446,7 +1446,6 @@ 你的人物很快將會出現。 用方向鍵行走。 -任何時候你都可按 F1 鍵察看幫助，進一步瞭解 [SECOND_LIFE]。 請選擇男性或女性化身。 以後你仍可改變這個選擇。 <usetemplate name="okcancelbuttons" notext="女性" yestext="男性"/> </notification> diff --git a/indra/newview/skins/default/xui/zh/strings.xml b/indra/newview/skins/default/xui/zh/strings.xml index cf6fa1d85f..1a094ea258 100644 --- a/indra/newview/skins/default/xui/zh/strings.xml +++ b/indra/newview/skins/default/xui/zh/strings.xml @@ -5531,9 +5531,6 @@ http://secondlife.com/support 求助解決問題。 <string name="Command_Grid_Status_Label"> 網格狀態 </string> - <string name="Command_HowTo_Label"> - 簡易教學 - </string> <string name="Command_Inventory_Label"> 收納區 </string> @@ -5630,9 +5627,6 @@ http://secondlife.com/support 求助解決問題。 <string name="Command_Grid_Status_Tooltip"> 顯示當前網格狀態 </string> - <string name="Command_HowTo_Tooltip"> - 如何完成常用的動作 - </string> <string name="Command_Inventory_Tooltip"> 察看並使用你擁有的物件 </string> |
