Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silly git, that's not how merges work!

Browse Source 
Fix automatic merge errors
Also fix some other compile errors
This commit is contained in:
Lirusaito
2019-01-21 04:55:27 -05:00
parent fcf4cf88ea
commit d340b74bb9
9 changed files with 115 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorypanel.cpp
View File

@@ -165,8 +165,8 @@ LLUUID getStartFolder(const std::string& start_folder)
const LLFolderType::EType preferred_type = LLViewerFolderType::lookupTypeFromNewCategoryName(start_folder);
return (preferred_type != LLFolderType::FT_NONE)
? gInventory.findCategoryUUIDForType(preferred_type, false, false)
: gInventory.getCategory(static_cast<LLUUID>(start_folder)) ? static_cast<LLUUID>(mStartFolder) // Singu Note: if start folder is an id of a folder, use it
? gInventory.findCategoryUUIDForType(preferred_type, false)
: gInventory.getCategory(static_cast<LLUUID>(start_folder)) ? static_cast<LLUUID>(start_folder) // Singu Note: if start folder is an id of a folder, use it
: LLUUID::null;
}
@@ -443,7 +443,7 @@ void LLInventoryPanel::setFilterSubString(const std::string& string)
if (string.empty())
{
// Unlike v3, do not clear other filters. Text is independent.
getFilter()->setFilterSubString(LLStringUtil::null);
getFilter().setFilterSubString(LLStringUtil::null);
getRootFolder()->restoreFolderState();
LLOpenFoldersWithSelection opener;
getRootFolder()->applyFunctorRecursively(opener);
@@ -1296,7 +1296,7 @@ void LLInventoryPanel::updateSelection()
namespace LLInventoryAction
{
bool doToSelected(LLFolderView* root, std::string action);
bool doToSelected(LLFolderView* root, std::string action, BOOL user_confirm = TRUE);
}
void LLInventoryPanel::doToSelected(const LLSD& userdata)