From 61f7c7e08f4eb0104cd0185c9fe656e7b48c84d1 Mon Sep 17 00:00:00 2001 From: tim Date: Mon, 27 May 2024 15:25:06 -0400 Subject: [PATCH] cleanup; refactor code units per CR feedback --- indra/newview/CMakeLists.txt | 2 + ...apmessage.fs.c++ => fsworldmapmessage.cpp} | 55 ++++++------------- ...rldmapmessage.fs.h => fsworldmapmessage.h} | 11 +++- indra/newview/llworldmapmessage.cpp | 22 +++++--- 4 files changed, 42 insertions(+), 48 deletions(-) rename indra/newview/{llworldmapmessage.fs.c++ => fsworldmapmessage.cpp} (76%) rename indra/newview/{llworldmapmessage.fs.h => fsworldmapmessage.h} (78%) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 54b9fa09be..f82e724340 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -167,6 +167,7 @@ set(viewer_SOURCE_FILES fsscriptlibrary.cpp fsscrolllistctrl.cpp fsslurlcommand.cpp + fsworldmapmessage.cpp groupchatlistener.cpp lggbeamcolormapfloater.cpp lggbeammapfloater.cpp @@ -960,6 +961,7 @@ set(viewer_HEADER_FILES fsscrolllistctrl.h fsslurl.h fsslurlcommand.h + fsworldmapmessage.h groupchatlistener.h llaccountingcost.h lggbeamcolormapfloater.h diff --git a/indra/newview/llworldmapmessage.fs.c++ b/indra/newview/fsworldmapmessage.cpp similarity index 76% rename from indra/newview/llworldmapmessage.fs.c++ rename to indra/newview/fsworldmapmessage.cpp index 5fc4d02415..14aa758d51 100644 --- a/indra/newview/llworldmapmessage.fs.c++ +++ b/indra/newview/fsworldmapmessage.cpp @@ -8,29 +8,19 @@ // - in particular where a grid hosts overlapping names, hop Region matching may work better -#include "llworldmapmessage.fs.h" +#include "fsworldmapmessage.h" #include #include -#include "llagent.h" #include "llcommon.h" +#include "llagent.h" #include "llsingleton.h" #include "llworldmap.h" // grid_to_region_handle #include "llworldmapmessage.h" #include "message.h" -#include "llnotificationsutil.h" - -#define htxhop_log(format, ...) \ - { \ - fprintf(stderr, format "\n", __VA_ARGS__); \ - fflush(stderr); \ - LLNotificationsUtil::add("ChatSystemMessageTip", LLSD().with("MESSAGE", llformat(format, __VA_ARGS__))); \ - LL_WARNS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL; \ - } - -#include "llviewercontrol.h" +#define htxhop_log(format, ...) LL_DEBUGS("GridManager") << llformat(format, __VA_ARGS__) << LL_ENDL; inline std::string extract_region(std::string const& s) { @@ -48,19 +38,6 @@ inline std::string extract_region(std::string const& s) } return {}; } -// int main() { -// for (const auto& s : { -// "http://hg.osgrid.org:80/ Vue North", -// "hop://hg.osgrid.org:80/ Vue North", -// "hg.osgrid.org:80/ Vue North", -// "hg.osgrid.org:80:Vue North", -// "hg.osgrid.org:80/Vue North", -// }) fprintf(stderr, "'%s' = '%s'\n", s, extract_region(s).c_str());fflush(stderr); -// return 0; -// } - -static LLCachedControl htxhop_flags(gSavedSettings, "htxhop_flags", 0, "default: 0\nLAYER_FLAG: 2\n"); -#define htxhop_debug_setting_disable (+htxhop_flags == 2) // helper to encapsulate Region Map Block responses struct _MapBlock { @@ -132,21 +109,24 @@ static std::map _region_name_queries; bool hypergrid_sendExactNamedRegionRequest(std::string const& region_name, url_callback_t const& callback, std::string const& callback_url, bool teleport) { - if (htxhop_debug_setting_disable || !callback) + if (!callback) { return false; + } auto key = extract_region(region_name); - if (key.empty()) + if (key.empty()) { return false; + } _region_name_queries[key] = { key, region_name, callback, callback_url, teleport }; - htxhop_log("[xxHTxx] Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str()); + htxhop_log("Send Region Name '%s' (key: %s)", region_name.c_str(), key.c_str()); _hypergrid_sendMapNameRequest(region_name, EXACT_FLAG); return true; } bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_flags) { - if (htxhop_debug_setting_disable || !msg) + if (!msg) { return false; + } // NOTE: we assume only agent_flags have been read from msg so far S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data); @@ -155,10 +135,9 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f for (int b = 0; b < num_blocks; b++) { blocks.emplace_back(msg, b); } - /* EXPIRE:>=2024-05-10 */ for (auto const& _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()); - + for (auto const& _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()); + } // 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(); @@ -169,13 +148,15 @@ bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, U32 agent_f for (auto const& _block : blocks) { auto key = extract_region(_block.name); - if (key.empty()) + if (key.empty()) { continue; + } auto idx = _region_name_queries.find(key); - if (idx == _region_name_queries.end()) + if (idx == _region_name_queries.end()) { continue; + } auto pending = idx->second; - htxhop_log("[xxHTxx] Recv Region Name '%s' (key: %s) block.name='%s' block.region_handle=%llu)", pending.region_name.c_str(), + 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); diff --git a/indra/newview/llworldmapmessage.fs.h b/indra/newview/fsworldmapmessage.h similarity index 78% rename from indra/newview/llworldmapmessage.fs.h rename to indra/newview/fsworldmapmessage.h index 22a54dc00f..8bbd7ba9e0 100644 --- a/indra/newview/llworldmapmessage.fs.h +++ b/indra/newview/fsworldmapmessage.h @@ -1,5 +1,10 @@ -// NOTE: optional header file in case wanting to integrate as .h/.cpp -#pragma once +/* + * @file fsworldmapmessage.h + */ + +#ifndef FS_WORLDMAPMESSAGE_H +#define FS_WORLDMAPMESSAGE_H + #include #include #include @@ -11,3 +16,5 @@ bool hypergrid_sendExactNamedRegionRequest( std::string const& callback_url, bool teleport); bool hypergrid_processExactNamedRegionResponse(LLMessageSystem* msg, uint32_t agent_flags); + +#endif // FS_WORLDMAPMESSAGE_H diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp index c0ddd453dd..879fc245df 100644 --- a/indra/newview/llworldmapmessage.cpp +++ b/indra/newview/llworldmapmessage.cpp @@ -35,10 +35,8 @@ // Aurora Sim #include "llviewernetwork.h" -#ifdef OPENSIM -#include "llworldmapmessage.fs.c++" -#endif // Aurora Sim +#include "fsworldmapmessage.h" // FIRE-31368: [OPENSIM] ... Search returns more than one result const U32 LAYER_FLAG = 2; @@ -102,9 +100,12 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name, const std::string& callback_url, bool teleport) // immediately teleport when result returned { -#ifdef OPENSIM - if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport)) return; -#endif + // FIRE-31368: [OPENSIM] ... Search returns more than one result + if (hypergrid_sendExactNamedRegionRequest(region_name, callback, callback_url, teleport)) { + return; + } + // + //LL_INFOS("WorldMap") << LL_ENDL; mSLURLRegionName = region_name; mSLURLRegionHandle = 0; @@ -167,9 +168,12 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**) U32 agent_flags; msg->getU32Fast(_PREHASH_AgentData, _PREHASH_Flags, agent_flags); -#ifdef OPENSIM - if (agent_flags != LAYER_FLAG && hypergrid_processExactNamedRegionResponse(msg, agent_flags)) return; -#endif + // FIRE-31368: [OPENSIM] ... Search returns more than one result + if (hypergrid_processExactNamedRegionResponse(msg, agent_flags)) { + return; + } + // + // There's only one flag that we ever use here if (agent_flags != LAYER_FLAG)