admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FIRE-36251] Fix crash with Omnifilter when receiving an item in OpenSim

Browse Source
This commit is contained in:
Hecklezz
2025-12-29 20:32:34 +10:00
parent 0bdfbd63d6
commit d77a846c34
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/llscriptfloater.cpp
+21 -2
View File
@@ -496,8 +496,27 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
std::string description = notification->asLLSD()["responder_sd"]["description"].asString();
if (!description.empty())
{
LLStringUtil::getTokens(description, params, "/");
haystack.mRegionName = LLURI::unescape(params.at(params.size() - 4));
if (LLGridManager::instance().isInSecondLife())
{
LLStringUtil::getTokens(description, params, "/");
haystack.mRegionName = LLURI::unescape(params.at(params.size() - 4));
}
else
{
// OpenSim handles notification descriptions a little differently
constexpr std::string_view location_key = "located at ";
auto location_pos_start = description.find(location_key);
auto location_pos_end = description.find(" <", location_pos_start);
if (location_pos_start != std::string_view::npos && location_pos_end != std::string_view::npos)
{
location_pos_start += location_key.size();
haystack.mRegionName = description.substr(location_pos_start, location_pos_end - location_pos_start);
}
else
{
haystack.mRegionName.clear();
}
}
}
haystack.mType = OmnifilterEngine::eType::URLRequest;