From 47c1fbea3e39b1826d0755499ce4f125f47aae70 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Fri, 31 May 2024 12:21:36 +0300
Subject: [PATCH 01/12] viewer#1600 Fixed being unable to delete links to worn
 objects

---
 indra/newview/llinventoryfunctions.cpp | 4 ++--
 indra/newview/llinventorygallery.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp
index 61bfcc86e8..7dd70c8644 100644
--- a/indra/newview/llinventoryfunctions.cpp
+++ b/indra/newview/llinventoryfunctions.cpp
@@ -3375,7 +3375,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
 
                 for (LLInventoryModel::item_array_t::value_type& item : items)
                 {
-                    if (get_is_item_worn(item))
+                    if (!item->getIsLinkType() && get_is_item_worn(item))
                     {
                         has_worn = true;
                         LLWearableType::EType type = item->getWearableType();
@@ -3395,7 +3395,7 @@ void LLInventoryAction::doToSelected(LLInventoryModel* model, LLFolderView* root
                 }
             }
             LLViewerInventoryItem* item = gInventory.getItem(obj_id);
-            if (item && get_is_item_worn(item))
+            if (item && !item->getIsLinkType() && get_is_item_worn(item))
             {
                 has_worn = true;
                 LLWearableType::EType type = item->getWearableType();
diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index 6b25857068..b873c6f702 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -1988,7 +1988,7 @@ void LLInventoryGallery::deleteSelection()
 
             for (LLInventoryModel::item_array_t::value_type& item : items)
             {
-                if (get_is_item_worn(item))
+                if (!item->getIsLinkType() && get_is_item_worn(item))
                 {
                     has_worn = true;
                     LLWearableType::EType type = item->getWearableType();
@@ -2009,7 +2009,7 @@ void LLInventoryGallery::deleteSelection()
         }
 
         LLViewerInventoryItem* item = gInventory.getItem(id);
-        if (item && get_is_item_worn(item))
+        if (item && !item->getIsLinkType() && get_is_item_worn(item))
         {
             has_worn = true;
             LLWearableType::EType type = item->getWearableType();            

From 32d9d4311829a7d5d6af46273221ff417e7901c4 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Fri, 31 May 2024 18:57:23 +0100
Subject: [PATCH 02/12] Fix crash due to invalidated reference use after erase.

---
 indra/newview/fsworldmapmessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index 48e1411142..dfc6390c54 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -199,7 +199,7 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
             continue;
         }
 
-        const auto& pending = idx->second;
+        auto pending = idx->second;
         htxhop_log("Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
             pending.key.c_str(), _block.name.c_str(), _block.region_handle());
         _region_name_queries.erase(idx);

From 0478229bcb1ca9580f89a92528b6a25824bae13b Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Fri, 31 May 2024 20:16:59 +0200
Subject: [PATCH 03/12] FIRE-33963 French translation update, by Laurent Bechir

---
 .../skins/default/xui/fr/floater_whitelist.xml  | 17 +++++++++++++++++
 .../skins/default/xui/fr/menu_viewer.xml        |  9 +++++++++
 .../xui/fr/panel_group_info_sidetray.xml        | 17 +++++++++++++----
 3 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/fr/floater_whitelist.xml

diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist.xml b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
new file mode 100644
index 0000000000..6d83b0c19f
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
@@ -0,0 +1,17 @@
+<floater name="whitelist_floater" title="Whitelist Folders and Binaries">
+	<text name="whitelist_intro">
+Les antivirus et les anti-logiciels malveillants sont un élément essentiel d'une utilisation sûre de l'internet, mais ils peuvent causer toute une série de problèmes à la visionneuse.
+Pour réduire les interférences et améliorer la stabilité et les performances, nous conseillons vivement à tous les utilisateurs de veiller à ce qu'il y ait des exclusions (connues sous le nom de liste blanche) pour les dossiers et les programmes importants que la visionneuse utilise.
+
+Pour plus d'informations, visitez le site
+https://wiki.firestormviewer.org/antivirus_whitelisting
+	</text>
+	<text name="whitelist_folder_instruction">
+Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utilisés par la visionneuse.
+Veuillez les ajouter à vos exclusions de dossiers AV, comme indiqué sur la page wiki ci-dessus.
+	</text>
+	<text name="whitelist_exe_instruction">
+La case suivante indique le nom et le chemin d'accès complet des exécutables de la visionneuse.
+Ajoutez-les à vos exclusions d'exécutables AV comme indiqué dans le wiki ci-dessus.
+	</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index d71588baaf..c665dcebd1 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -267,8 +267,17 @@
 		<menu_item_call label="Horaires des classes Firestorm" name="Firestorm Classes Schedule"/>
 		<menu_item_call label="Calendrier des évènements Firestorm" name="Firestorm Events Calendar"/>
 		<menu_item_check label="Guide" name="How To"/>
+		<!-- <menu_item_call label="Aide Second Life" name="Second Life Help"/>-->
 		<menu_item_call label="Aide [CURRENT_GRID]" name="current_grid_help"/>
 		<menu_item_call label="À propos de [CURRENT_GRID]" name="current_grid_about"/>
+		<!-- <menu_item_call label="Tutoriels" name="Tutorial"/>
+		<menu_item_call label="Base de connaissance" name="Knowledge Base"/>
+		<menu_item_call label="Wiki" name="Wiki"/>
+		<menu_item_call label="Forums communautaires" name="Community Forums"/>
+		<menu_item_call label="Portail d'assistance" name="Support portal"/>
+		<menu_item_call label="Nouvelles de [SECOND_LIFE]" name="Second Life News"/>
+		<menu_item_call label="Blogs de [SECOND_LIFE]" name="Second Life Blogs"/>-->
+		<menu_item_call name="whitelist_folders" label="Conseils de liste blanche"/>
 		<menu_item_check label="Consulter l'état de la grille" name="Grid Status"/>
 		<menu_item_call label="Signaler une infraction" name="Report Abuse"/>
 		<menu_item_call label="Signaler un problème" name="Report Bug"/>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
index 2bb67f774e..21dd703a9f 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_info_sidetray.xml
@@ -9,7 +9,10 @@
 	<panel.string name="leave_txt">Quitter</panel.string>
 	<layout_stack name="group_info_sidetray_main">
 		<layout_panel name="header_container">
-			<panel name="group_info_top"><line_editor label="Saisissez le nom de votre nouveau groupe ici" name="group_name_editor"/></panel>
+			<panel name="group_info_top">
+				<text_editor name="group_name" value="(Chargement ...)"/>
+				<line_editor label="Saisissez le nom de votre nouveau groupe ici" name="group_name_editor"/>
+			</panel>
 		</layout_panel>
 		<layout_panel name="group_info_content">
 			<layout_stack name="layout">
@@ -24,11 +27,17 @@
 				</layout_panel>
 			</layout_stack>
 			<layout_stack name="button_row_ls">
-				<layout_panel name="btn_chat_lp"><button label="Chat" name="btn_chat"/></layout_panel>
-				<layout_panel name="call_btn_lp"><button name="btn_call" label="Appel de groupe" tool_tip="Appeler ce groupe"/></layout_panel>
+				<layout_panel name="btn_activate_lp">
+					<button label="Activer" name="btn_activate" />
+				</layout_panel>
+				<layout_panel name="btn_chat_lp">
+					<button label="Chat" name="btn_chat"/>
+				</layout_panel>
+				<layout_panel name="call_btn_lp">
+					<button name="btn_call" label="Appel de groupe" tool_tip="Appeler ce groupe"/>
+				</layout_panel>
 				<layout_panel name="btn_apply_lp">
 					<button label="Enregistrer" label_selected="Enregistrer" name="btn_apply"/>
-					<button label="Créer un groupe" name="btn_create" tool_tip="Créer un nouveau groupe"/>
 				</layout_panel>
 			</layout_stack>
 		</layout_panel>

From ed1484a5136dba5a974495064b8e4195e1da82b7 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 1 Jun 2024 12:31:49 +0200
Subject: [PATCH 04/12] Put Hypergrid handling in its own namespace

---
 indra/newview/fsworldmapmessage.cpp | 207 ++++++++++++++--------------
 indra/newview/fsworldmapmessage.h   |  11 +-
 indra/newview/llworldmapmessage.cpp |   4 +-
 3 files changed, 114 insertions(+), 108 deletions(-)

diff --git a/indra/newview/fsworldmapmessage.cpp b/indra/newview/fsworldmapmessage.cpp
index dfc6390c54..9d53bbf74c 100644
--- a/indra/newview/fsworldmapmessage.cpp
+++ b/indra/newview/fsworldmapmessage.cpp
@@ -48,98 +48,101 @@
 
 #define htxhop_log(format, ...) LL_DEBUGS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL;
 
-static inline std::string extract_region(const std::string& s)
+namespace hypergrid
 {
-    static auto const& patterns = {
-        std::regex { R"(/ ([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "slash space" embedding...
-        std::regex { R"(([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "grid:port:region" embedding...
+    static inline std::string extract_region(const std::string& s)
+    {
+        static auto const& patterns = {
+            std::regex { R"(/ ([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "slash space" embedding...
+            std::regex { R"(([^/:=]+)$)" }, // TODO: figure out where the spec lives for hop "grid:port:region" embedding...
+        };
+        std::smatch match_results;
+        std::string ls{ s };
+        LLStringUtil::toLower(ls);
+        for (const auto& pattern : patterns)
+        {
+            if (std::regex_search(ls, match_results, pattern))
+            {
+                return match_results[1].str();
+            }
+        }
+        return {};
+    }
+
+    // helper to encapsulate Region Map Block responses
+    struct MapBlock
+    {
+        S32 index{};
+        U16 x_regions{}, y_regions{}, x_size{ REGION_WIDTH_UNITS }, y_size{ REGION_WIDTH_UNITS };
+        std::string name{};
+        U8 accesscode{};
+        U32 region_flags{};
+        LLUUID image_id{};
+
+        inline U32 x_world() const { return (U32)(x_regions)*REGION_WIDTH_UNITS; }
+        inline U32 y_world() const { return (U32)(y_regions)*REGION_WIDTH_UNITS; }
+        inline U64 region_handle() const { return grid_to_region_handle(x_regions, y_regions); }
+
+        // see: LLWorldMapMessage::processMapBlockReply
+        MapBlock(LLMessageSystem* msg, S32 block)
+            : index(block)
+        {
+            msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
+            msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
+            msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
+            msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, accesscode, block);
+            msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
+            //        msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
+            //        msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
+            msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
+            // <FS:CR> Aurora Sim
+            if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0)
+            {
+                msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block);
+                msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block);
+            }
+            if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0)
+            {
+                x_size = 256;
+                y_size = 256;
+            }
+            // </FS:CR> Aurora Sim
+        }
     };
-    std::smatch match_results;
-    std::string ls { s };
-    LLStringUtil::toLower(ls);
-    for (const auto& pattern : patterns)
+
+    constexpr U32 EXACT_FLAG = 0x00000000;
+    constexpr U32 LAYER_FLAG = 0x00000002;
+
+    // see: LLWorldMapMessage::sendNamedRegionRequest
+    static void sendMapNameRequest(const std::string& region_name, U32 flags)
     {
-        if (std::regex_search(ls, match_results, pattern))
-        {
-            return match_results[1].str();
-        }
+        LLMessageSystem* msg = gMessageSystem;
+        msg->newMessageFast(_PREHASH_MapNameRequest);
+        msg->nextBlockFast(_PREHASH_AgentData);
+        msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
+        msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
+        msg->addU32Fast(_PREHASH_Flags, flags);
+        msg->addU32Fast(_PREHASH_EstateID, 0); // Filled in on sim
+        msg->addBOOLFast(_PREHASH_Godlike, false); // Filled in on sim
+        msg->nextBlockFast(_PREHASH_NameData);
+        msg->addStringFast(_PREHASH_Name, region_name);
+        gAgent.sendReliableMessage();
     }
-    return {};
+
+    struct AdoptedRegionNameQuery
+    {
+        std::string key{};
+        std::string region_name{};
+        hypergrid::url_callback_t arbitrary_callback;
+        std::string arbitrary_slurl{};
+        bool arbitrary_teleport{ false };
+    };
+
+    // map extracted region names => pending query entries
+    static std::map<std::string, AdoptedRegionNameQuery> region_name_queries;
 }
 
-// helper to encapsulate Region Map Block responses
-struct _MapBlock
-{
-    S32 index {};
-    U16 x_regions {}, y_regions {}, x_size { REGION_WIDTH_UNITS }, y_size { REGION_WIDTH_UNITS };
-    std::string name {};
-    U8 accesscode {};
-    U32 region_flags {};
-    LLUUID image_id {};
-
-    inline U32 x_world() const { return (U32)(x_regions)*REGION_WIDTH_UNITS; }
-    inline U32 y_world() const { return (U32)(y_regions)*REGION_WIDTH_UNITS; }
-    inline U64 region_handle() const { return grid_to_region_handle(x_regions, y_regions); }
-
-    // see: LLWorldMapMessage::processMapBlockReply
-    _MapBlock(LLMessageSystem* msg, S32 block)
-        : index(block)
-    {
-        msg->getU16Fast(_PREHASH_Data, _PREHASH_X, x_regions, block);
-        msg->getU16Fast(_PREHASH_Data, _PREHASH_Y, y_regions, block);
-        msg->getStringFast(_PREHASH_Data, _PREHASH_Name, name, block);
-        msg->getU8Fast(_PREHASH_Data, _PREHASH_Access, accesscode, block);
-        msg->getU32Fast(_PREHASH_Data, _PREHASH_RegionFlags, region_flags, block);
-        //        msg->getU8Fast(_PREHASH_Data, _PREHASH_WaterHeight, water_height, block);
-        //        msg->getU8Fast(_PREHASH_Data, _PREHASH_Agents, agents, block);
-        msg->getUUIDFast(_PREHASH_Data, _PREHASH_MapImageID, image_id, block);
-        // <FS:CR> Aurora Sim
-        if (msg->getNumberOfBlocksFast(_PREHASH_Size) > 0)
-        {
-            msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeX, x_size, block);
-            msg->getU16Fast(_PREHASH_Size, _PREHASH_SizeY, y_size, block);
-        }
-        if (x_size == 0 || (x_size % 16) != 0 || (y_size % 16) != 0)
-        {
-            x_size = 256;
-            y_size = 256;
-        }
-        // </FS:CR> Aurora Sim
-    }
-};
-
-constexpr U32 EXACT_FLAG = 0x00000000;
-constexpr U32 LAYER_FLAG = 0x00000002;
-
-// see: LLWorldMapMessage::sendNamedRegionRequest
-static void _hypergrid_sendMapNameRequest(const std::string& region_name, U32 flags)
-{
-    LLMessageSystem* msg = gMessageSystem;
-    msg->newMessageFast(_PREHASH_MapNameRequest);
-    msg->nextBlockFast(_PREHASH_AgentData);
-    msg->addUUIDFast(_PREHASH_AgentID, gAgentID);
-    msg->addUUIDFast(_PREHASH_SessionID, gAgentSessionID);
-    msg->addU32Fast(_PREHASH_Flags, flags);
-    msg->addU32Fast(_PREHASH_EstateID, 0); // Filled in on sim
-    msg->addBOOLFast(_PREHASH_Godlike, false); // Filled in on sim
-    msg->nextBlockFast(_PREHASH_NameData);
-    msg->addStringFast(_PREHASH_Name, region_name);
-    gAgent.sendReliableMessage();
-}
-
-struct _AdoptedRegionNameQuery
-{
-    std::string key{};
-    std::string region_name{};
-    url_callback_t arbitrary_callback;
-    std::string arbitrary_slurl{};
-    bool arbitrary_teleport{ false };
-};
-
-// map extracted region names => pending query entries
-static std::map<std::string, _AdoptedRegionNameQuery> _region_name_queries;
-
-bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport)
+bool hypergrid::sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport)
 {
     if (!LLGridManager::instance().isInOpenSim() || !callback)
     {
@@ -151,13 +154,13 @@ bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const
     {
         return false;
     }
-    _region_name_queries[key] = { key, region_name, callback, callback_url, teleport };
+    region_name_queries.try_emplace(key, AdoptedRegionNameQuery{ key, region_name, callback, callback_url, teleport });
     htxhop_log("Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str());
-    _hypergrid_sendMapNameRequest(region_name, EXACT_FLAG);
+    sendMapNameRequest(region_name, EXACT_FLAG);
     return true;
 }
 
-bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
+bool hypergrid::processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags)
 {
     if (!LLGridManager::instance().isInOpenSim() || !msg || agent_flags & LAYER_FLAG)
     {
@@ -166,44 +169,44 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f
     // NOTE: we assume only agent_flags have been read from msg so far
     S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
 
-    std::vector<_MapBlock> blocks;
+    std::vector<MapBlock> blocks;
     blocks.reserve(num_blocks);
     for (S32 b = 0; b < num_blocks; b++)
     {
         blocks.emplace_back(msg, b);
     }
-    for (const auto& _block : blocks)
+    for (const auto& block : blocks)
     {
-        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", _block.index, extract_region(_block.name).c_str(), _block.name.c_str(), _block.region_handle());
+        htxhop_log("#%02d key='%s' block.name='%s' block.region_handle=%llu", block.index, extract_region(block.name).c_str(), block.name.c_str(), block.region_handle());
     }
     // special case: handle singular result w/empty name tho valid region handle AND singular pending query as a match
     // (might be that a landing area / redirect hop URL is coming back: "^hop://grid:port/$", which extract_region's into "")
     bool solo_result = blocks.size() == 2 && blocks[0].region_handle() && extract_region(blocks[0].name).empty() && !blocks[1].region_handle();
-    if (solo_result && _region_name_queries.size() == 1)
+    if (solo_result && region_name_queries.size() == 1)
     {
         htxhop_log("applying first block as redirect; region_handle: %llu", blocks[0].region_handle());
-        blocks[0].name = _region_name_queries.begin()->second.region_name;
+        blocks[0].name = region_name_queries.begin()->second.region_name;
     }
 
-    for (const auto& _block : blocks)
+    for (const auto& block : blocks)
     {
-        auto key = extract_region(_block.name);
+        auto key = extract_region(block.name);
         if (key.empty())
         {
             continue;
         }
 
-        auto idx = _region_name_queries.find(key);
-        if (idx == _region_name_queries.end())
+        auto idx = region_name_queries.find(key);
+        if (idx == region_name_queries.end())
         {
             continue;
         }
 
-        auto pending = idx->second;
+        auto pending{ idx->second };
         htxhop_log("Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(),
-            pending.key.c_str(), _block.name.c_str(), _block.region_handle());
-        _region_name_queries.erase(idx);
-        pending.arbitrary_callback(_block.region_handle(), pending.arbitrary_slurl, _block.image_id, pending.arbitrary_teleport);
+            pending.key.c_str(), block.name.c_str(), block.region_handle());
+        region_name_queries.erase(idx);
+        pending.arbitrary_callback(block.region_handle(), pending.arbitrary_slurl, block.image_id, pending.arbitrary_teleport);
         return true;
     }
     return false;
diff --git a/indra/newview/fsworldmapmessage.h b/indra/newview/fsworldmapmessage.h
index 2464ef15fd..3e4cca01e7 100644
--- a/indra/newview/fsworldmapmessage.h
+++ b/indra/newview/fsworldmapmessage.h
@@ -37,10 +37,13 @@
 class LLMessageSystem;
 class LLUUID;
 
-using url_callback_t = std::function<void(uint64_t region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
-
-bool hypergrid_sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport);
-bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags);
+namespace hypergrid
+{
+    // Needs to be identical to url_callback_t defined in llworldmapmessage.h
+    using url_callback_t = std::function<void(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>;
 
+    bool sendExactNamedRegionRequest(const std::string& region_name, const url_callback_t& callback, const std::string& callback_url, bool teleport);
+    bool processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags);
+}
 #endif
 #endif // FS_WORLDMAPMESSAGE_H
diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp
index bbd0da9895..d521f5ded9 100644
--- a/indra/newview/llworldmapmessage.cpp
+++ b/indra/newview/llworldmapmessage.cpp
@@ -102,7 +102,7 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
 {
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
 #ifdef OPENSIM
-    if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport))
+    if (hypergrid::sendExactNamedRegionRequest(region_name, callback, callback_url, teleport))
     {
         return;
     }
@@ -171,7 +171,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
     msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags);
     // <FS:humbletim> FIRE-31368: [OPENSIM] ... Search returns more than one result
 #ifdef OPENSIM
-    if (hypergrid_processExactNamedRegionResponse(msg, agent_flags))
+    if (hypergrid::processExactNamedRegionResponse(msg, agent_flags))
     {
         return;
     }

From 8952e143bbd6ce9d68799e7c83c9d27e8673761a Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 1 Jun 2024 21:49:06 +0100
Subject: [PATCH 05/12] [OPENSIM] New grid builder for OpenSim

Integrate with login, Note: hop URLS nor supported by Dullahan
replace grids.xml with a minimal grids list.
Update settings and grids.xml for the new grid builder.
update legacy login page too
---
 indra/newview/app_settings/grids.xml          | 1086 +----------------
 indra/newview/app_settings/settings.xml       |   11 +
 indra/newview/fspanellogin.cpp                |    9 +
 indra/newview/fspanellogin.h                  |    1 +
 .../skins/default/xui/en/panel_fs_login.xml   |   34 +-
 .../default/xui/en/panel_fs_nui_login.xml     |   12 +
 6 files changed, 69 insertions(+), 1084 deletions(-)

diff --git a/indra/newview/app_settings/grids.xml b/indra/newview/app_settings/grids.xml
index 2a2e599f07..5c37cb0767 100644
--- a/indra/newview/app_settings/grids.xml
+++ b/indra/newview/app_settings/grids.xml
@@ -1,942 +1,32 @@
 <llsd>
     <map>
-    <key>alternatemetaverse.com:8002</key>
+        <key>localhost:9000</key>
         <map>
         <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
+            <date>2024-05-28T12:00:00Z</date>
+        <key>grid_login_id</key>
+            <string>localhost:9000</string>
         <key>gridname</key>
-            <string>Alternate Metaverse</string>
+            <string>localhost</string>
         <key>gridnick</key>
-            <string>AMV</string>
+            <string>localhost</string>
         <key>login_identifier_types</key>
             <array>
                 <string>agent</string>
                 <string>account</string>
             </array>
         <key>loginpage</key>
-            <string>https://alternatemetaverse.com/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://alternatemetaverse.com:8002</string>
-            </array>
-        <key>name</key>
-            <string>alternatemetaverse.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>slurl_base</key>
-            <string>hop://alternatemetaverse.com:8002/</string>
-        </map>
-    <key>astralia.eu:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T11:43:19.89Z</date>
-        <key>gatekeeper</key>
-            <string>astralia.eu:8002</string>
-        <key>gridname</key>
-            <string>astralia</string>
-        <key>gridnick</key>
-            <string>astralia</string>
-        <key>helperuri</key>
-            <string>http://astralia.eu//currency/helper/landtool.php</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://astralia.eu</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://astralia.eu:8002/</string>
-            </array>
-        <key>name</key>
-            <string>astralia.eu:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>slurl_base</key>
-            <string>hop://astralia.eu:8002/</string>
-        </map>
-    <key>cc.opensimulator.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-09T10:00:00Z</date>
-        <key>gatekeeper</key>
-            <string>cc.opensimulator.org:8002</string>
-        <key>gridname</key>
-            <string>OpenSim Community Conference</string>
-        <key>gridnick</key>
-            <string>opensimcc</string>
-        <key>helperuri</key>
-            <string>http://cc.opensimulator.org/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://cc.opensimulator.org:8005/wifi/welcome.html</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://cc.opensimulator.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>cc.opensimulator.org:8002</string>
-        <key>password</key>
-            <string>http://cc.opensimulator.org:8005/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://cc.opensimulator.org:8005/wifi/user/account</string>
-        <key>slurl_base</key>
-            <string>hop://cc.opensimulator.org:8002/</string>
-        </map>
-    <key>craft-world.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T14:23:31.86Z</date>
-        <key>about</key>
-            <string>https://www.craft-world.org/</string>
-        <key>gatekeeper</key>
-            <string>craft-world.org:8002</string>
-        <key>gridname</key>
-            <string>Craft World</string>
-        <key>gridnick</key>
-            <string>craft</string>
-        <key>help</key>
-            <string>https://www.craft-world.org/page/en/support.php</string>
-        <key>helperuri</key>
-            <string>http://webapp.craft-world.org/economy/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://www.craft-world.org/loginscreen.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://craft-world.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>craft-world.org:8002</string>
-        <key>password</key>
-            <string>https://www.craft-world.org/page/en/avatar-tools.php</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://www.craft-world.org/page/en/register-an-avatar.php</string>
-        <key>slurl_base</key>
-            <string>hop://craft-world.org:8002/</string>
-        </map>
-    <key>discoverygrid.net:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-04-24T12:06:59.18Z</date>
-        <key>about</key>
-            <string>https://discoverygrid.net/about.php</string>
-        <key>gatekeeper</key>
-            <string>discoverygrid.net:8002</string>
-        <key>gridname</key>
-            <string>DiscoveryGrid</string>
-        <key>gridnick</key>
-            <string>DiscoveryGrid</string>
-        <key>help</key>
-            <string>https://discoverygrid.net</string>
-        <key>helperuri</key>
-            <string>https://discoverygrid.net/apps/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://discoverygrid.net/viewersplash.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://discoverygrid.net:8002/</string>
-            </array>
-        <key>name</key>
-            <string>discoverygrid.net:8002</string>
-        <key>password</key>
-            <string>https://discoverygrid.net/#needpw</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://discoverygrid.net/index.php#create</string>
-        <key>slurl_base</key>
-            <string>hop://discoverygrid.net:8002/</string>
-        </map>
-    <key>fireandicegrid.net:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:59.83Z</date>
-        <key>about</key>
-            <string>http://fireandicegrid.net</string>
-        <key>gatekeeper</key>
-            <string>fireandicegrid.net:8002</string>
-        <key>gridname</key>
-            <string>Fire And Ice Grid</string>
-        <key>gridnick</key>
-            <string>FireAndIceGrid</string>
-        <key>help</key>
-            <string>http://fireandicegrid.net</string>
-        <key>helperuri</key>
-            <string>http://fireandicegrid.net</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://fireandicegrid.net</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://fireandicegrid.net:8002/</string>
-            </array>
-        <key>name</key>
-            <string>fireandicegrid.net:8002</string>
-        <key>password</key>
-            <string>http://fireandicegrid.net:8002/wifi</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://fireandicegrid.net:8002/wifi</string>
-        <key>slurl_base</key>
-            <string>hop://fireandicegrid.net:8002/</string>
-        </map>
-    <key>gaynations.org:7002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>gaynations.org:7002</string>
-        </map>
-    <key>goto.theencoreescape.com:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2020-04-24T17:00:50.92Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://theencoreescape.com/</string>
-        <key>gatekeeper</key>
-            <string>goto.theencoreescape.com:8002</string>
-        <key>gridname</key>
-            <string>The Encore Escape</string>
-        <key>gridnick</key>
-            <string>EncoreEscape</string>
-        <key>help</key>
-            <string>http://theencoreescape.com/</string>
-        <key>helperuri</key>
-            <string>http://money.theencoreescape.com/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://splash.theencoreescape.com/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://goto.theencoreescape.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>goto.theencoreescape.com:8002</string>
-        <key>password</key>
-            <string>http://theencoreescape.com/</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://theencoreescape.com/</string>
-        <key>search</key>
-            <string>http://search.theencoreescape.com/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://goto.theencoreescape.com:8002/</string>
-        </map>
-    <key>grid.3rdrockgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2012-08-03T15:32:54.31Z</date>
-        <key>about</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>gridname</key>
-            <string>3RD Rock Grid</string>
-        <key>gridnick</key>
-            <string>3RG</string>
-        <key>help</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>helperuri</key>
-            <string>http://grid.3rdrockgrid.com/3rg_money/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://grid.3rdrockgrid.com/3rg_login/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.3rdrockgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.3rdrockgrid.com:8002</string>
-        <key>password</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>register</key>
-            <string>http://3rdrockgrid.com/</string>
-        <key>slurl_base</key>
-            <string>hop://grid.3rdrockgrid.com:8002/</string>
-        </map>
-
-    <key>grid.avacon.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T12:01:35.02Z</date>
-        <key>gatekeeper</key>
-            <string>grid.avacon.org:8002</string>
-        <key>gridname</key>
-            <string>AvaCon Grid</string>
-        <key>gridnick</key>
-            <string>avacon</string>
-        <key>helperuri</key>
-            <string>http://grid.avacon.org/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://grid.avacon.org:8005/wifi/welcome.html</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.avacon.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.avacon.org:8002</string>
-        <key>password</key>
-            <string>http://grid.avacon.org:8005/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://grid.avacon.org:8005/wifi/user/account</string>
-        <key>slurl_base</key>
-            <string>hop://grid.avacon.org:8002/</string>
-        </map>
-    <key>grid.kitely.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2014-03-20T12:30:00Z</date>
-        <key>gatekeeper</key>
-            <string>grid.kitely.com:8002</string>
-        <key>gridname</key>
-            <string>Kitely</string>
-        <key>gridnick</key>
-            <string>kitely</string>
-        <key>helperuri</key>
-            <string>http://grid.kitely.com:8002/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.kitely.com/viewer_login</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.kitely.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.kitely.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>slurl_base</key>
-            <string>hop://grid.kitely.com:8002/</string>
-        </map>
-    <key>grid.virtualife.cloud:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:50:32.55Z</date>
-        <key>about</key>
-            <string>http://www.virtualife.cloud</string>
-        <key>gatekeeper</key>
-            <string>grid.virtualife.cloud:8002</string>
-        <key>gridname</key>
-            <string>virtualife world</string>
-        <key>gridnick</key>
-            <string>Virtualife world</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.virtualife.cloud/index.php?option=com_opensim</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://grid.virtualife.cloud:8002/</string>
-            </array>
-        <key>name</key>
-            <string>grid.virtualife.cloud:8002</string>
-        <key>password</key>
-            <string>http://grid.virtualife.cloud:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://grid.virtualife.cloud:8002/wifi/user/account</string>
-        <key>slurl_base</key>
-            <string>hop://grid.virtualife.cloud:8002/</string>
-        </map>
-    <key>grid01.from-ne.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>name</key>
-            <string>grid01.from-ne.com:8002</string>
-        </map>
-    <key>hypergrid.org:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-04-02T01:01:24.65Z</date>
-        <key>about</key>
-            <string>http://www.hypergrid.org/metropolis/wiki</string>
-        <key>gatekeeper</key>
-            <string>hypergrid.org:8002</string>
-        <key>gridname</key>
-            <string>Metropolis Metaversum</string>
-        <key>gridnick</key>
-            <string>Metropolis</string>
-        <key>help</key>
-            <string>http://metropolis.hypergrid.org/forum</string>
-        <key>helperuri</key>
-            <string>http://metropolis.hypergrid.org/currency/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://metropolis.hypergrid.org</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://hypergrid.org:8002/</string>
-            </array>
-        <key>name</key>
-            <string>hypergrid.org:8002</string>
-        <key>password</key>
-            <string>http://metropolis.hypergrid.org/password.php</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.hypergrid.org/metropolis/metro_rg.php</string>
-        <key>slurl_base</key>
-            <string>hop://hypergrid.org:8002/</string>
-        </map>
-    <key>islandoasisgrid.biz:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-01-21T20:10:35.17Z</date>
-        <key>about</key>
-            <string>http://www.islandoasis.biz/GridStats.aspx</string>
-        <key>gridname</key>
-            <string>Island Oasis</string>
-        <key>gridnick</key>
-            <string>Island_Oasis</string>
-        <key>help</key>
-            <string>http://www.islandoasis.biz/Support.aspx</string>
-        <key>helperuri</key>
-            <string>http://islandoasisgrid:8020/OsCurrency/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.islandoasis.biz/welcome.aspx</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://islandoasisgrid.biz:8002/</string>
-            </array>
-        <key>name</key>
-            <string>islandoasisgrid.biz:8002</string>
-        <key>password</key>
-            <string>http://www.islandoasis.biz/Login.aspx</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.islandoasis.biz/verification.aspx</string>
-        <key>slurl_base</key>
-            <string>hop://islandoasisgrid.biz:8002/</string>
-        </map>
-    <key>lfgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-03-18T21:51:17.62Z</date>
-        <key>about</key>
-            <string>http://lfgrid.com/about/</string>
-        <key>gatekeeper</key>
-            <string>lfgrid.com:8002</string>
-        <key>gridname</key>
-            <string>Littlefield Grid</string>
-        <key>gridnick</key>
-            <string>LFgrid</string>
-        <key>help</key>
-            <string>http://lfgrid.com/help</string>
-        <key>helperuri</key>
-            <string>http://lfgrid.com/services/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.lfgrid.com/splash/index.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://lfgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>lfgrid.com:8002</string>
-        <key>password</key>
-            <string>http://lfgrid.com:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://lfgrid.com:8002/wifi/user/account/</string>
-        <key>slurl_base</key>
-            <string>hop://lfgrid.com:8002/</string>
-        </map>
-    <key>login.aviworlds.com:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:55.32Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://aviworlds.com</string>
-        <key>gatekeeper</key>
-            <string>login.aviworlds.com:8002</string>
-        <key>gridname</key>
-            <string>AviWorlds</string>
-        <key>gridnick</key>
-            <string>Avi</string>
-        <key>help</key>
-            <string>http://aviworlds.com</string>
-        <key>helperuri</key>
-            <string>http://login.aviworlds.com/helper_scripts/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://login.aviworlds.com/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.aviworlds.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>login.aviworlds.com:8002</string>
-        <key>password</key>
-            <string>http://login.aviworlds.com:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://login.aviworlds.com:8002/wifi/user/account/</string>
-        <key>search</key>
-            <string>http://login.aviworlds.com/ossearch/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://login.aviworlds.com:8002/</string>
-        </map>
-    <key>login.digiworldz.com:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2015-07-24T13:19:44.27Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://digiworldz.com/</string>
-        <key>gatekeeper</key>
-            <string>login.digiworldz.com:8002</string>
-        <key>gridname</key>
-            <string>DigiWorldZ Grid</string>
-        <key>gridnick</key>
-            <string>DWG</string>
-        <key>help</key>
-            <string>http://digiworldz.com/</string>
-        <key>helperuri</key>
-            <string>http://money.digiworldz.com/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://splash.digiworldz.com/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.digiworldz.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>login.digiworldz.com:8002</string>
-        <key>password</key>
-            <string>http://digiworldz.com/</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://digiworldz.com/</string>
-        <key>search</key>
-            <string>http://search.digiworldz.com/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://login.digiworldz.com:8002/</string>
-        </map>
-    <key>login.francogrid.org:80</key>
-        <map>
-        <key>LastModified</key>
-            <date>2013-02-14T02:00:46.10Z</date>
-        <key>about</key>
-            <string>http://francogrid.org/</string>
-        <key>gridname</key>
-            <string>FrancoGrid</string>
-        <key>gridnick</key>
-            <string>francogrid</string>
-        <key>help</key>
-            <string>http://francogrid.org/aide</string>
-        <key>helperuri</key>
-            <string>http://helper.main.francogrid.org/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://viewer.francogrid.org/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.francogrid.org/</string>
-            </array>
-        <key>name</key>
-            <string>login.francogrid.org:80</string>
-        <key>password</key>
-            <string>http://francogrid.org/user/password</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://francogrid.org/user/register</string>
-        <key>slurl_base</key>
-            <string>hop://login.francogrid.org:80/</string>
-        </map>
-    <key>login.greatcanadiangrid.ca:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>login.greatcanadiangrid.ca:8002</string>
-        </map>
-    <key>login.osgrid.org</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-04-19T21:15:00Z</date>
-        <key>about</key>
-            <string>http://www.osgrid.org/</string>
-        <key>gatekeeper</key>
-            <string>hg.osgrid.org:80</string>
-        <key>gridname</key>
-            <string>OSGrid</string>
-        <key>gridnick</key>
-            <string>osgrid</string>
-        <key>help</key>
-            <string>http://www.osgrid.org/</string>
-        <key>helperuri</key>
-            <string>http://helper.osgrid.org/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.osgrid.org/splash/</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.osgrid.org/</string>
-            </array>
-        <key>name</key>
-            <string>login.osgrid.org</string>
-        <key>password</key>
-            <string>http://www.osgrid.org/</string>
-        <key>platform</key>
             <undef />
-        <key>register</key>
-            <string>http://www.osgrid.org/</string>
-        <key>slurl_base</key>
-            <string>hop://login.osgrid.org/</string>
-        <key>web_profile_url</key>
-            <string>http://my.osgrid.org/?name=[AGENT_NAME]</string>
-        </map>
-    <key>login.ufsgrid.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>name</key>
-            <string>login.ufsgrid.com:8002</string>
-        </map>
-    <key>login.zetaworlds.com</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T12:39:31.19Z</date>
-        <key>about</key>
-            <string>https://zetaworlds.com/</string>
-        <key>gridname</key>
-            <string>ZetaWorlds</string>
-        <key>gridnick</key>
-            <string>ZetaWorlds</string>
-        <key>helperuri</key>
-            <string>http://money.zetaworlds.com/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://zetaworlds.com/splash</string>
         <key>loginuri</key>
             <array>
-                <string>https://login.zetaworlds.com/</string>
+                <string>http://localhost:9000</string>
             </array>
         <key>name</key>
-            <string>login.zetaworlds.com</string>
-        <key>password</key>
-            <string>https://zetaworlds.com/user/forgot</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://zetaworlds.com/user/register</string>
+            <string>localhost:9000</string>
         <key>slurl_base</key>
-            <string>hop://login.zetaworlds.com/</string>
-        </map>
-    <key>login.zonenations.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:43:24.96Z</date>
-        <key>about</key>
-            <string>https://www.zonenations.com/</string>
-        <key>gatekeeper</key>
-            <string>login.zonenations.com:8002</string>
-        <key>gridname</key>
-            <string>Zone Nations</string>
-        <key>gridnick</key>
-            <string>ZoneNations</string>
-        <key>help</key>
-            <string>https://www.zonenations.com/supporto.html</string>
-        <key>helperuri</key>
-            <string>https://www.zonenations.com/components/com_opensim/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://www.zonenations.com/index.php?option=com_opensim</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.zonenations.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>login.zonenations.com:8002</string>
-        <key>password</key>
-            <string>https://www.zonenations.com/password-smarrita.html</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://www.zonenations.com/iscriviti.html</string>
-        <key>slurl_base</key>
-            <string>hop://login.zonenations.com:8002/</string>
-        </map>
-    <key>login.main.mobiusgrid.us:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>name</key>
-            <string>login.main.mobiusgrid.us:8002</string>
-        </map>
-    <key>main.mobiusgrid.us</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-06-02T13:19:55.40Z</date>
-        <key>about</key>
-            <string>https://mobiusgrid.us/about</string>
-        <key>gridname</key>
-            <string>Mobius Grid</string>
-        <key>gridnick</key>
-            <string>Mobius</string>
-        <key>help</key>
-            <string>https://mobiusgrid.us/help</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://mobiusgrid.us/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://login.main.mobiusgrid.us</string>
-            </array>
-        <key>name</key>
-            <string>main.mobiusgrid.us</string>
-        <key>password</key>
-            <string>https://mobiusgrid.us/forgot</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://mobiusgrid.us/join</string>
-        <key>slurl_base</key>
-            <string>hop://main.mobiusgrid.us/</string>
-        </map>
-    <key>partydestinationgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:48:17.58Z</date>
-        <key>about</key>
-            <string>https://partydestinationgrid.com/</string>
-        <key>gatekeeper</key>
-            <string>partydestinationgrid.com:8002</string>
-        <key>gridname</key>
-            <string>Party Destination Grid</string>
-        <key>gridnick</key>
-            <string>partydestinationgrid</string>
-        <key>help</key>
-            <string>https://partydestinationgrid.com/index.php/help/help</string>
-        <key>helperuri</key>
-            <string>http://partydestinationgrid.com/components/com_opensim/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://module.partydestinationgrid.com/login</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://partydestinationgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>partydestinationgrid.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://partydestinationgrid.com/index.php/component/users/?view=registration</string>
-        <key>slurl_base</key>
-            <string>hop://partydestinationgrid.com:8002/</string>
-        </map>
-    <key>tanglegrid.net:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:49:43.20Z</date>
-        <key>about</key>
-            <string>http://tanglegrid.com/</string>
-        <key>gatekeeper</key>
-            <string>tanglegrid.net:8002</string>
-        <key>gridname</key>
-            <string>TanGLe Grid</string>
-        <key>gridnick</key>
-            <string>TanGLe</string>
-        <key>help</key>
-            <string>http://tanglegrid.com/contact.php</string>
-        <key>helperuri</key>
-            <string>http://tanglegrid.net/scripts/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://tanglegrid.net/web_interface/loginscreen.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://tanglegrid.net:8002/</string>
-            </array>
-        <key>name</key>
-            <string>tanglegrid.net:8002</string>
-        <key>password</key>
-            <string>http://www.tanglegrid.net/web_interface/index.php?page=forgotpass</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.tanglegrid.net/web_interface/avatar.php</string>
-        <key>search</key>
-            <string>http://www.tanglegrid.net/helper/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://tanglegrid.net:8002/</string>
-        </map>
-    <key>thekazgrid.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2019-12-04T10:47:15.79Z</date>
-        <key>about</key>
-            <string>https://www.thekazgrid.com/index.php/11-about/6-about</string>
-        <key>gridname</key>
-            <string>TheKaz Grid</string>
-        <key>gridnick</key>
-            <string>TheKaz</string>
-        <key>helperuri</key>
-            <string>https://www.thekazgrid.com/currency/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>https://www.thekazgrid.com/index.php?option=com_opensim</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://thekazgrid.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>thekazgrid.com:8002</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>https://www.thekazgrid.com/index.php/join</string>
-        <key>slurl_base</key>
-            <string>hop://thekazgrid.com:8002/</string>
-        </map>
-    <key>util.aditi.lindenlab.com</key>
+            <string>hop://localhost:9000/</string>
+        </map>        
+        <key>util.aditi.lindenlab.com</key>
         <map>
         <key>LastModified</key>
             <date>2018-09-26T20:15:00Z</date>
@@ -953,7 +43,7 @@
                 <string>agent</string>
             </array>
         <key>loginpage</key>
-            <string>https://phoenixviewer.com/app/loginV3/</string>
+            <string>http://phoenixviewer.com/app/loginV3/</string>
         <key>loginuri</key>
             <array>
                 <string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
@@ -986,7 +76,7 @@
             <string>agent</string>
         </array>
         <key>loginpage</key>
-        <string>https://phoenixviewer.com/app/loginV3/</string>
+        <string>http://phoenixviewer.com/app/loginV3/</string>
         <key>loginuri</key>
         <array>
             <string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
@@ -999,156 +89,6 @@
         <integer>1</integer>
         <key>web_profile_url</key>
         <string>https://my.secondlife.com/</string>
-    </map>
-    <key>grid.alifevirtual.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-04-04T10:42:24.54Z</date>
-        <key>name</key>
-            <string>grid.alifevirtual.com:8002</string>
-        </map>
-    <key>www.alifevirtual.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2020-05-30T09:41:01.73Z</date>
-        <key>about</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>gridname</key>
-            <string>Alife Virtual</string>
-        <key>gridnick</key>
-            <string>AV</string>
-        <key>help</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>helperuri</key>
-            <string>http://www.alifevirtual.com/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://www.alifevirtual.com/welcome.php</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://www.alifevirtual.com:8002/</string>
-            </array>
-        <key>name</key>
-            <string>www.alifevirtual.com:8002</string>
-        <key>password</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://www.alifevirtual.com/</string>
-        <key>slurl_base</key>
-            <string>hop://www.alifevirtual.com:8002/</string>
-        </map>
-    <key>grid.avatarconnection.com:8002/</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>grid.avatarconnection.com:8002/</string>
-        </map>
-    <key>grid.roleplayworlds.net:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>grid.roleplayworlds.net:8002</string>
-        </map>
-    <key>inworldz.com:8002</key>
-        <map>
-        <key>LastModified</key>
-            <date>2018-08-23T21:00:00.00Z</date>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>name</key>
-            <string>inworldz.com:8002</string>
-        </map>
-    <key>login.avination.com/</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>name</key>
-            <string>login.avination.com/</string>
-        <key>LastModified</key>
-            <date>2018-02-28T15:36:26.43Z</date>
-        </map>
-    <key>login.danger.osgrid.org</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>login.danger.osgrid.org</string>
-        </map>
-    <key>reactiongrid.com:8008</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>reactiongrid.com:8008</string>
-        </map>
-    <key>login.aurorascape.com:8002</key>
-        <map>
-        <key>DEPRECATED</key>
-            <string>TRUE</string>
-        <key>LastModified</key>
-            <date>2020-06-02T11:41:00.95Z</date>
-        <key>name</key>
-            <string>login.aurorascape.com:8002</string>
-        </map>
-    <key>vidadupla.com.br:8002</key>
-        <map>
-        <key>DirectoryFee</key>
-            <string>0</string>
-        <key>LastModified</key>
-            <date>2020-11-06T14:42:01.07Z</date>
-        <key>SendGridInfoToViewerOnLogin</key>
-            <string>true</string>
-        <key>about</key>
-            <string>http://vidadupla.com.br</string>
-        <key>gatekeeper</key>
-            <string>vidadupla.com.br:8002</string>
-        <key>gridname</key>
-            <string>Vida Dupla</string>
-        <key>gridnick</key>
-            <string>VD</string>
-        <key>helperuri</key>
-            <string>http://vidadupla.com.br/helper_scripts/helper/</string>
-        <key>login_identifier_types</key>
-            <array>
-                <string>agent</string>
-                <string>account</string>
-            </array>
-        <key>loginpage</key>
-            <string>http://vidadupla.com.br/splash</string>
-        <key>loginuri</key>
-            <array>
-                <string>http://vidadupla.com.br:8002/</string>
-            </array>
-        <key>name</key>
-            <string>vidadupla.com.br:8002</string>
-        <key>password</key>
-            <string>http://vidadupla.com.br:8002/wifi/forgotpassword</string>
-        <key>platform</key>
-            <string>OpenSim</string>
-        <key>register</key>
-            <string>http://vidadupla.com.br:8002/wifi/user/account/</string>
-        <key>search</key>
-            <string>http://vidadupla.com.br/ossearch/query.php</string>
-        <key>slurl_base</key>
-            <string>hop://vidadupla.com.br:8002/</string>
         </map>
     </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 31aed2fcb1..fcb8f9febb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -153,6 +153,17 @@
     <key>Value</key>
     <string>http://phoenixviewer.com/app/fsdata/grids.xml</string>
   </map>
+  <key>FSGridBuilderURL</key>
+  <map>
+    <key>Comment</key>
+    <string>Fetch an html page of grids from this URL.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>https://phoenixviewer.com/app/fsdata/fs_grid_builder.html</string>
+  </map>
   <key>LastConnectedGrid</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 1e5e8c5019..222b5dbd4e 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -250,6 +250,9 @@ FSPanelLogin::FSPanelLogin(const LLRect &rect,
     LLTextBox* grid_mgr_help_text = getChild<LLTextBox>("grid_login_text");
     grid_mgr_help_text->setClickedCallback(onClickGridMgrHelp, NULL);
 
+    LLTextBox* grid_builder_text = getChild<LLTextBox>("grid_builder_text");
+    grid_builder_text->setClickedCallback(onClickGridBuilder, NULL);
+
     LLSLURL start_slurl(LLStartUp::getStartSLURL());
     // The StartSLURL might have been set either by an explicit command-line
     // argument (CmdLineLoginLocation) or by default.
@@ -1356,6 +1359,12 @@ void FSPanelLogin::onClickGridMgrHelp(void*)
     }
 }
 
+//static
+void FSPanelLogin::onClickGridBuilder(void*)
+{
+    LLWeb::loadURLInternal(gSavedSettings.getString("FSGridBuilderURL"));
+}
+
 void FSPanelLogin::onSelectUser()
 {
     LL_INFOS("AppInit") << "onSelectUser()" << LL_ENDL;
diff --git a/indra/newview/fspanellogin.h b/indra/newview/fspanellogin.h
index be348ac25c..5963972abd 100644
--- a/indra/newview/fspanellogin.h
+++ b/indra/newview/fspanellogin.h
@@ -111,6 +111,7 @@ private:
     static void onClickRemove(void*);
     static void onRemoveCallback(const LLSD& notification, const LLSD& response);
     static void onClickGridMgrHelp(void*);
+    static void onClickGridBuilder(void*);
     static std::string credentialName();
 
 private:
diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index 05fdee217b..c720ca40ed 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -158,17 +158,17 @@
           top_pad="0"
           name="start_location_combo"
           width="165">
-        <combo_box.item
-            label="Last location"
-            name="MyLastLocation"
-            value="last" />
-        <combo_box.item
-            label="Home"
-            name="MyHome"
-            value="home" />
-        <combo_box.item
-            label="&lt;Type region name&gt;"
-            name="Typeregionname" value="" />
+          <combo_box.item
+          label="Last location"
+          name="MyLastLocation"
+          value="last" />
+          <combo_box.item
+          label="Home"
+          name="MyHome"
+          value="home" />
+          <combo_box.item
+          label="&lt;Type region name&gt;"
+          name="Typeregionname" value="" />
       </combo_box>
     </layout_panel>
     <layout_panel
@@ -179,6 +179,17 @@
         width="145"
         height="80"
         visible="false">
+      <text
+        follows="left|top|right"
+        font="SansSerifMedium"
+        text_color="EmphasisColor"
+        top="10"
+        height="16"
+        name="grid_builder_text"
+        left="5"
+        width="190">
+      + Click to add more grids
+      </text>
       <text
         follows="left|bottom"
         font="SansSerifSmall"
@@ -193,6 +204,7 @@
         allow_text_entry="true"
         follows="left|bottom"
         height="22"
+        top_pad="0"
         max_chars="256"
         force_disable_fulltext_search="true"
         combo_editor.commit_on_focus_lost="false"
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index b03589554a..65745ad788 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -282,6 +282,18 @@
     <combo_box.drop_down_button
       font="SansSerifLarge"/>
     </combo_box>
+    <text
+      follows="left|top|right"
+      font="SansSerifMedium"
+      text_color="EmphasisColor"
+      top_pad="5"
+      height="16"
+      name="grid_builder_text"
+      valign="center"
+      left="45"
+      width="190">
+    + Click to add more grids
+    </text>
     </layout_panel>
     <layout_panel
       follows="left|top|right"

From ecf297e6a13d1c0df2fb5578a338a67dfa97ad14 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Sat, 1 Jun 2024 21:57:20 +0100
Subject: [PATCH 06/12] unb0rk the indents that broke somehow.

---
 .../skins/default/xui/en/panel_fs_login.xml   | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/panel_fs_login.xml b/indra/newview/skins/default/xui/en/panel_fs_login.xml
index c720ca40ed..52500edb4f 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_login.xml
@@ -150,23 +150,23 @@
         Start at:
       </text>
       <combo_box
-          allow_text_entry="true"
-          control_name="NextLoginLocation"
-          follows="left|bottom"
-          height="22"
-          max_chars="128"
-          top_pad="0"
-          name="start_location_combo"
-          width="165">
-          <combo_box.item
+        allow_text_entry="true"
+        control_name="NextLoginLocation"
+        follows="left|bottom"
+        height="22"
+        max_chars="128"
+        top_pad="0"
+        name="start_location_combo"
+        width="165">
+        <combo_box.item
           label="Last location"
           name="MyLastLocation"
           value="last" />
-          <combo_box.item
+        <combo_box.item
           label="Home"
           name="MyHome"
           value="home" />
-          <combo_box.item
+        <combo_box.item
           label="&lt;Type region name&gt;"
           name="Typeregionname" value="" />
       </combo_box>

From 14cc5f026bbb87d654f2ee5d07694cd672154637 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 2 Jun 2024 02:37:56 +0200
Subject: [PATCH 07/12] Update German translation

---
 indra/newview/skins/default/xui/de/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/de/panel_fs_nui_login.xml | 3 +++
 indra/newview/skins/default/xui/en/panel_fs_nui_login.xml | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/de/panel_fs_login.xml b/indra/newview/skins/default/xui/de/panel_fs_login.xml
index 42d8bdbeee..3f5cb17650 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_login.xml
@@ -34,6 +34,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text">
+				+ Klicken um Grids hinzuzufügen
+			</text>
 			<text name="grid_login_text">
 				Gridauswahl:
 			</text>
diff --git a/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
index 3c8688ec84..b5e3865d9d 100644
--- a/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_fs_nui_login.xml
@@ -37,6 +37,9 @@
 							<text name="grid_login_text">
 								Grid:
 							</text>
+							<text name="grid_builder_text">
+								+ Klicken um Grids hinzuzufügen
+							</text>
 						</layout_panel>
 						<layout_panel name="mode_selection">
 							<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
index 65745ad788..a709af3ecb 100644
--- a/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_fs_nui_login.xml
@@ -291,7 +291,7 @@
       name="grid_builder_text"
       valign="center"
       left="45"
-      width="190">
+      width="250">
     + Click to add more grids
     </text>
     </layout_panel>

From 3316049ba7dba88d17db8cd33fd1f6947ead9543 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sun, 2 Jun 2024 16:01:13 +0200
Subject: [PATCH 08/12] FIRE-33849: Fix Favorite Wearables list not updating
 properly when filtering

---
 indra/newview/fsfloaterwearablefavorites.cpp | 1 +
 indra/newview/fsfloaterwearablefavorites.h   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/indra/newview/fsfloaterwearablefavorites.cpp b/indra/newview/fsfloaterwearablefavorites.cpp
index e0d7c3984a..0e3a79e748 100644
--- a/indra/newview/fsfloaterwearablefavorites.cpp
+++ b/indra/newview/fsfloaterwearablefavorites.cpp
@@ -313,6 +313,7 @@ void FSFloaterWearableFavorites::onFilterEdit(const std::string& search_string)
 {
     mItemsList->setFilterSubString(search_string, true);
     mItemsList->setNoItemsCommentText(getString("empty_list"));
+    mItemsList->rearrange();
 }
 
 void FSFloaterWearableFavorites::onOptionsMenuItemClicked(const LLSD& userdata)
diff --git a/indra/newview/fsfloaterwearablefavorites.h b/indra/newview/fsfloaterwearablefavorites.h
index ee13a7e9f5..21431c7635 100644
--- a/indra/newview/fsfloaterwearablefavorites.h
+++ b/indra/newview/fsfloaterwearablefavorites.h
@@ -61,6 +61,11 @@ public:
         return mDADSignal.connect(cb);
     }
 
+    void rearrange()
+    {
+        rearrangeItems();
+    }
+
 protected:
     friend class LLUICtrlFactory;
     FSWearableFavoritesItemsList(const Params&);

From 05be30749d9b7786901130ea8e342002b7b003a9 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Sun, 2 Jun 2024 18:06:12 +0200
Subject: [PATCH 09/12] FIRE-33972, FIRE-33974: Updated French (by Laurent
 Bechir), Russian (by Romka Swallowtail) and Polish translations - login panel

---
 indra/newview/skins/default/xui/fr/floater_whitelist.xml  | 8 ++++----
 indra/newview/skins/default/xui/fr/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml | 3 +++
 indra/newview/skins/default/xui/pl/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml | 3 +++
 indra/newview/skins/default/xui/ru/panel_fs_login.xml     | 3 +++
 indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml | 1 +
 7 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/floater_whitelist.xml b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
index 6d83b0c19f..43c7cbe09f 100644
--- a/indra/newview/skins/default/xui/fr/floater_whitelist.xml
+++ b/indra/newview/skins/default/xui/fr/floater_whitelist.xml
@@ -1,17 +1,17 @@
-<floater name="whitelist_floater" title="Whitelist Folders and Binaries">
+<floater name="whitelist_floater" title="Liste blanche de dossiers et programmes">
 	<text name="whitelist_intro">
 Les antivirus et les anti-logiciels malveillants sont un élément essentiel d'une utilisation sûre de l'internet, mais ils peuvent causer toute une série de problèmes à la visionneuse.
-Pour réduire les interférences et améliorer la stabilité et les performances, nous conseillons vivement à tous les utilisateurs de veiller à ce qu'il y ait des exclusions (connues sous le nom de liste blanche) pour les dossiers et les programmes importants que la visionneuse utilise.
+Pour réduire les interférences et améliorer la stabilité et les performances, nous conseillons vivement à tous les utilisateurs de veiller à ce qu'il y ait des exclusions (connues sous le nom de liste blanche) pour les dossiers et les programmes importants que la visionneuse utilise. 
 
 Pour plus d'informations, visitez le site
 https://wiki.firestormviewer.org/antivirus_whitelisting
 	</text>
 	<text name="whitelist_folder_instruction">
-Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utilisés par la visionneuse.
+Pour vous simplifier la tâche, l'encadré ci-dessous indique les dossiers utilisés par la visionneuse. 
 Veuillez les ajouter à vos exclusions de dossiers AV, comme indiqué sur la page wiki ci-dessus.
 	</text>
 	<text name="whitelist_exe_instruction">
-La case suivante indique le nom et le chemin d'accès complet des exécutables de la visionneuse.
+La case suivante indique le nom et le chemin d'accès complet des exécutables de la visionneuse. 
 Ajoutez-les à vos exclusions d'exécutables AV comme indiqué dans le wiki ci-dessus.
 	</text>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_login.xml b/indra/newview/skins/default/xui/fr/panel_fs_login.xml
index 73f9e42d81..f3e1c749ac 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_login.xml
@@ -17,6 +17,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text">
+				+ Ajouter des grilles
+			</text>
 			<text name="grid_login_text">Connexion à la Grille :</text>
 		</layout_panel>
 		<layout_panel name="links_login_panel">
diff --git a/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
index fb0ad900ce..f0d8968d49 100644
--- a/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_fs_nui_login.xml
@@ -37,6 +37,9 @@
 							<text name="grid_login_text" width="55">
 								Grille :
 							</text>
+							<text name="grid_builder_text">
+								+ Ajouter des grilles
+							</text>
 						</layout_panel>
 						<layout_panel name="mode_selection">
 							<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_login.xml b/indra/newview/skins/default/xui/pl/panel_fs_login.xml
index ad4302a343..dbb2a84c4f 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_login.xml
@@ -28,6 +28,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text">
+				+ Kliknij, by dodać światy
+			</text>
 			<text name="grid_login_text">
 				Loguj do świata:
 			</text>
diff --git a/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
index ba215d8ec0..08af7c43a2 100644
--- a/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/pl/panel_fs_nui_login.xml
@@ -34,6 +34,9 @@
 							<text name="grid_login_text" width="55">
 								Świat:
 							</text>
+							<text name="grid_builder_text">
+								+ Kliknij, by dodać światy
+							</text>
 						</layout_panel>
 						<layout_panel name="mode_selection">
 							<text name="mode_selection_text">
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_login.xml b/indra/newview/skins/default/xui/ru/panel_fs_login.xml
index c5ba3bbd22..a6ee2abfe8 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_login.xml
@@ -28,6 +28,9 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel name="grid_panel">
+			<text name="grid_builder_text" width="300">
+				+ Нажмите чтобы добавить больше сеток
+			</text>
 			<text name="grid_login_text">
 				Подключиться к сетке:
 			</text>
diff --git a/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml b/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
index 4d1ae4bc90..b64cdf63c9 100644
--- a/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
+++ b/indra/newview/skins/default/xui/ru/panel_fs_nui_login.xml
@@ -33,6 +33,7 @@
           <layout_stack name="2nd_row_stack">
             <layout_panel name="grid_panel">
               <text name="grid_login_text" width="45">Сеть:</text>
+              <text name="grid_builder_text" width="300">+ Нажмите чтобы добавить больше сеток</text>
             </layout_panel>
             <layout_panel name="mode_selection">
               <text name="mode_selection_text">Режим:</text>

From f862fc375cfec8c020a811f66c999c6a438d1bc5 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 4 Jun 2024 01:19:04 +0100
Subject: [PATCH 10/12] Disable the pointless hardware check unless someone
 really wants them

---
 indra/newview/app_settings/settings.xml | 11 +++++++++++
 indra/newview/llappviewer.cpp           |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index fcb8f9febb..f6f33b84dc 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13761,6 +13761,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1</integer>
     </map>
+  <key>FSUseLegacyUnsupportedHardwareChecks</key>
+    <map>
+      <key>Comment</key>
+      <string>If enabled, Firestorm will perform utterly pointless checks that probably made sense in 2004.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+  </map>
   <key>FSUseStandaloneGroupFloater</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 5da9af8c81..0efacea44f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1163,7 +1163,7 @@ bool LLAppViewer::init()
     }
 
     // alert the user if they are using unsupported hardware
-    if(!gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
+    if(gSavedSettings.getBOOL("FSUseLegacyUnsupportedHardwareChecks") && !gSavedSettings.getBOOL("AlertedUnsupportedHardware"))
     {
         bool unsupported = false;
         LLSD args;

From 2a73551f8b5640c50f943b5944b43699b5031dd7 Mon Sep 17 00:00:00 2001
From: Beq <beqjanus@gmail.com>
Date: Tue, 4 Jun 2024 01:26:59 +0100
Subject: [PATCH 11/12] FIRE-33958 - Tentative fix for zombie notifications

I've only had limited success in reproducing this, so that fact I can't repro after fixing is not that compelling. However, when the issue occurs the underlying notification has been removed but the UI remains, this seems consistent with notification list being updated outside of the mutex guard and causing issues.
Note: LLNotifications has a number of methods that do an initial find and then call updateItem. I have not, at this point locked the higher livel calls as the updateItem call itself is locked and the higher level find is not likely to be problematic. If problems persist we can try guarding those too.
---
 indra/llui/llnotifications.cpp | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 9ae60ab301..052987b69f 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1014,6 +1014,7 @@ LLBoundListener LLNotificationChannelBase::connectChangedImpl(const LLEventListe
 
 LLBoundListener LLNotificationChannelBase::connectAtFrontChangedImpl(const LLEventListener& slot)
 {
+    LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against against unlocked access to mItems
     for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it)
     {
         slot(LLSD().with("sigtype", "load").with("id", (*it)->id()));
@@ -1052,10 +1053,17 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload)
 bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPtr pNotification)
 {
     std::string cmd = payload["sigtype"];
-    LLNotificationSet::iterator foundItem = mItems.find(pNotification);
-    bool wasFound = (foundItem != mItems.end());
+    // <FS:Beq> Guard against unlocked access to mItems
+    // LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+    // bool wasFound = (foundItem != mItems.end());
+    bool wasFound = false;
+    {
+        LLMutexLock lock(&mItemsMutex);
+        LLNotificationSet::iterator foundItem = mItems.find(pNotification);
+        wasFound = (foundItem != mItems.end());
+    } 
+    // </FS:Beq>
     bool passesFilter = mFilter ? mFilter(pNotification) : true;
-
     // first, we offer the result of the filter test to the simple
     // signals for pass/fail. One of these is guaranteed to be called.
     // If either signal returns true, the change processing is NOT performed
@@ -1084,6 +1092,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         assert(!wasFound);
         if (passesFilter)
         {
+          LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
             // not in our list, add it and say so
             mItems.insert(pNotification);
             onLoad(pNotification);
@@ -1107,6 +1116,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
             }
             else
             {
+                LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
                 // not in our list, add it and say so
                 mItems.insert(pNotification);
                 onChange(pNotification);
@@ -1120,6 +1130,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         {
             if (wasFound)
             {
+                LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
                 // it already existed, so this is a delete
                 mItems.erase(pNotification);
                 onChange(pNotification);
@@ -1138,6 +1149,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         assert(!wasFound);
         if (passesFilter)
         {
+            LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
             // not in our list, add it and say so
             mItems.insert(pNotification);
             onAdd(pNotification);
@@ -1149,6 +1161,7 @@ bool LLNotificationChannelBase::updateItem(const LLSD& payload, LLNotificationPt
         // if we have it in our list, pass on the delete, then delete it, else do nothing
         if (wasFound)
         {
+            LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked access to mItems
             onDelete(pNotification);
             abortProcessing = mChanged(payload);
             mItems.erase(pNotification);
@@ -1714,6 +1727,7 @@ void LLNotifications::add(const LLNotificationPtr pNotif)
     if (pNotif == NULL) return;
 
     // first see if we already have it -- if so, that's a problem
+    LLMutexLock lock(&mItemsMutex); // <FS:Beq/> Guard against unlocked acceess to mItems
     LLNotificationSet::iterator it=mItems.find(pNotif);
     if (it != mItems.end())
     {

From 7c1b60aeba3b08aacb3c5e1d66139db911259869 Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Tue, 4 Jun 2024 21:32:42 +0200
Subject: [PATCH 12/12] Enable multi-properties floater for task inventory

---
 indra/newview/llpanelobjectinventory.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index ac2459be80..459a33d111 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -627,13 +627,12 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 // [/RLVa:KB]
     }
     items.push_back(std::string("Task Properties"));
-    // <FS:Ansariel> Legacy object properties
+    // <FS:Ansariel> Improved object properties
     //if ((flags & FIRST_SELECTED_ITEM) == 0)
-    if (!gSavedSettings.getBOOL("FSUseLegacyObjectProperties") && (flags & FIRST_SELECTED_ITEM) == 0)
+    //{
+    //    disabled_items.push_back(std::string("Task Properties"));
+    //}
     // </FS:Ansariel>
-    {
-        disabled_items.push_back(std::string("Task Properties"));
-    }
 // [RLVa:KB] - Checked: 2010-09-28 (RLVa-1.2.1f) | Added: RLVa-1.2.1f
     items.push_back(std::string("Task Rename"));
     if ( (!isItemRenameable()) || ((flags & FIRST_SELECTED_ITEM) == 0) )
@@ -1007,13 +1006,12 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
         }
     }
     items.push_back(std::string("Task Properties"));
-    // <FS:Ansariel> Legacy object properties
+    // <FS:Ansariel> Improved object properties
     //if ((flags & FIRST_SELECTED_ITEM) == 0)
-    if (!gSavedSettings.getBOOL("FSUseLegacyObjectProperties") && (flags & FIRST_SELECTED_ITEM) == 0)
+    //{
+    //    disabled_items.push_back(std::string("Task Properties"));
+    //}
     // </FS:Ansariel>
-    {
-        disabled_items.push_back(std::string("Task Properties"));
-    }
     if(isItemRenameable())
     {
         items.push_back(std::string("Task Rename"));