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

Sync llappearancemgr.cpp with upstream and rllva

Browse Source 
Remove old unused stuff
Comment out some questionable stuff that's not upstream
Rearrange a thing to match upstream

Hopefully this fixes the baking bug?
This commit is contained in:
Lirusaito
2016-05-26 10:13:42 -04:00
parent 0abb0c916c
commit 3bedb5f6d4
4 changed files with 377 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llinventoryfunctions.cpp
View File

@@ -253,16 +253,18 @@ BOOL get_is_parent_to_worn_item(const LLUUID& id)
return FALSE;
}
BOOL get_is_item_worn(const LLInventoryItem *item)
{
if (!item)
return FALSE;
// Consider the item as worn if it has links in COF.
/* if (LLCOFMgr::instance().isLinkInCOF(item->getUUID()))
{ REMOVED due to advice from Kitty Barnett, looks like it WILL cause trouble on some grids -SG
return TRUE;
} */
// [SL:KB] - The code below causes problems across the board so it really just needs to go
// if (LLAppearanceMgr::instance().isLinkedInCOF(id))
// {
// return TRUE;
// }
switch(item->getType())
{
@@ -298,7 +300,7 @@ BOOL get_can_item_be_worn(const LLUUID& id)
if (!item)
return FALSE;
if (LLAppearanceMgr::isLinkInCOF(item->getLinkedUUID()))
if (LLAppearanceMgr::isLinkedInCOF(item->getLinkedUUID()))
{
// an item having links in COF (i.e. a worn item)
return FALSE;