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

Giant VMM merge, still need to compile it and fix llfloatermarketplacelistings

Browse Source 
Merge VMM up to change 187902d9c4afd2990acddeb964c928179a52d189

mAllowWear=>mAllowOpen (should probably just remove this altogether though
inventory_panels now accept the "show_root_folder", "allow_drop_on_root", "allow_open", and "use_marketplace_folders" attributes.

Other stuff in this commit:
LLPanelInjector~
Sync lltooldraganddrop to alchemy
Sync notifications up with alchemy
Reorganize notifications some, to better merge with upstream
Remove duplicate InventorySortOrder in settings map
There's a bit of a weird folderview merge mixed into here, I wouldn't trust it, but this thing is so god damn tangled I can't go back now~

Wouldn't have been possible without help from Shyotl and music by Amanda Palmer
This commit is contained in:
Inusaito Sayori
2015-07-30 11:45:19 -04:00
committed by Lirusaito
parent 167d336274
commit f140b4f35c
46 changed files with 3480 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llfolderviewitem.cpp
View File

@@ -588,7 +588,7 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
void LLFolderViewItem::openItem( void )
{
if (!mListener) return;
if (mAllowWear || mListener->isItemWearable())
if (mAllowOpen || mListener->isItemWearable())
{
mListener->openItem();
}
@@ -1771,7 +1771,7 @@ void LLFolderViewFolder::gatherChildRangeExclusive(LLFolderViewItem* start, LLFo
{
return;
}
if (selecting)
if (selecting && (*it)->getVisible())
{
items.push_back(*it);
}
@@ -1790,7 +1790,7 @@ void LLFolderViewFolder::gatherChildRangeExclusive(LLFolderViewItem* start, LLFo
return;
}
if (selecting)
if (selecting && (*it)->getVisible())
{
items.push_back(*it);
}
@@ -1812,7 +1812,7 @@ void LLFolderViewFolder::gatherChildRangeExclusive(LLFolderViewItem* start, LLFo
return;
}
if (selecting)
if (selecting && (*it)->getVisible())
{
items.push_back(*it);
}
@@ -1831,7 +1831,7 @@ void LLFolderViewFolder::gatherChildRangeExclusive(LLFolderViewItem* start, LLFo
return;
}
if (selecting)
if (selecting && (*it)->getVisible())
{
items.push_back(*it);
}
@@ -2878,21 +2878,21 @@ bool LLInventorySort::operator()(const LLFolderViewItem* const& a, const LLFolde
}
else if (mFoldersByWeight)
{
S32 weight_a = compute_stock_count(a->getUUID());
S32 weight_b = compute_stock_count(b->getUUID());
S32 weight_a = compute_stock_count(a->getListener()->getUUID());
S32 weight_b = compute_stock_count(b->getListener()->getUUID());
if (weight_a == weight_b)
{
// Equal weight -> use alphabetical order
return (LLStringUtil::compareDict(a->getDisplayName(), b->getDisplayName()) < 0);
return (LLStringUtil::compareDict(a->getListener()->getDisplayName(), b->getListener()->getDisplayName()) < 0);
}
else if (weight_a == -1)
else if (weight_a == COMPUTE_STOCK_INFINITE)
{
// No weight -> move a at the end of the list
// No stock -> move a at the end of the list
return false;
}
else if (weight_b == -1)
else if (weight_b == COMPUTE_STOCK_INFINITE)
{
// No weight -> move b at the end of the list
// No stock -> move b at the end of the list
return true;
}
else