livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6572 FIXED UI freezes when clicking on a specific folder in the inventory

master
andreykproductengine 2016-07-14 19:31:35 +03:00
parent efb49c8ccf
commit 9a262f345e
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llui/llui.cpp
View File

@ -522,7 +522,7 @@ const LLView* LLUI::resolvePath(const LLView* context, const std::string& path)
else
{
std::string part(ti->begin(), ti->end());
context = context->findChildView(part, recurse);
context = context->findChildView(LLURI::unescape(part), recurse);
recurse = false;
}
}

22
indra/llui/llview.cpp
View File

@ -391,7 +391,27 @@ static void buildPathname(std::ostream& out, const LLView* view)
buildPathname(out, view->getParent());
// Build pathname into ostream on the way back from recursion.
out << '/' << view->getName();
out << '/';
// substitute all '/' in name with appropriate code
std::string name = view->getName();
std::size_t found = name.find('/');
std::size_t start = 0;
while (found != std::string::npos)
{
std::size_t sub_len = found - start;
if (sub_len > 0)
{
out << name.substr(start, sub_len);
}
out << "%2F";
start = found + 1;
found = name.find('/', start);
}
if (start < name.size())
{
out << name.substr(start, name.size() - start);
}
}
std::string LLView::getPathname() const