Skip to content

#4719 use correct search query when navigating to the page #4732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
Merged

#4719 use correct search query when navigating to the page #4732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions indra/newview/llfloatersearch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,22 @@ class LLSearchHandler : public LLCommandHandler {
bool handle(const LLSD& tokens, const LLSD& query_map, const std::string& grid, LLMediaCtrl* web) {
const size_t parts = tokens.size();

// get the (optional) category for the search
std::string collection;
if (parts > 0)
{
collection = tokens[0].asString();
}

// get the (optional) search string
std::string search_text;
if (parts > 1)
{
search_text = tokens[1].asString();
}

// open the search floater and perform the requested search
LLFloaterReg::showInstance("search", tokens);
LLFloaterReg::showInstance("search", llsd::map("collection", collection,"query", search_text));
return true;
}
};
Expand Down Expand Up @@ -84,25 +98,11 @@ void LLFloaterSearch::initiateSearch(const LLSD& tokens)
// substituted into the final URL using the logic from the original search.
subs["TYPE"] = "standard";

const size_t parts = tokens.size();
std::string collection = tokens.has("collection") ? tokens["collection"].asString() : "";

// get the (optional) category for the search
std::string collection;
if (parts > 0)
{
collection = tokens[0].asString();
}

// get the (optional) search string
std::string search_text;
if (parts > 1)
{
search_text = tokens[1].asString();
}
std::string search_text = tokens.has("query") ? tokens["query"].asString() : "";

// TODO: where does category get set? I cannot find a reference to
// it in internal docs - might be conflated with values in mSearchType
std::string category;
std::string category = tokens.has("category") ? tokens["category"].asString() : "";
if (mSearchType.find(category) != mSearchType.end())
{
subs["TYPE"] = category;
Expand Down