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

Fix compilation with gcc

Browse Source
This commit is contained in:
Latif Khalifa
2014-03-28 08:30:22 +01:00
parent dc9d3fbf96
commit 80076833d1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llappearancemgr.cpp
View File

@@ -1731,7 +1731,8 @@ bool LLAppearanceMgr::getCanRemoveFromCOF(const LLUUID& outfit_cat_id)
// Is there an active gesture in outfit_cat_id? // Is there an active gesture in outfit_cat_id?
items.reset(); items.reset();
gInventory.collectDescendentsIf(outfit_cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH, LLIsType(LLAssetType::AT_GESTURE), /*follow_folder_links=*/ true); LLIsType is_gesture(LLAssetType::AT_GESTURE);
gInventory.collectDescendentsIf(outfit_cat_id, cats, items, LLInventoryModel::EXCLUDE_TRASH, is_gesture, /*follow_folder_links=*/ true);
for(S32 i = 0; i < items.count(); ++i) for(S32 i = 0; i < items.count(); ++i)
if (LLGestureMgr::instance().isGestureActive(items.get(i)->getLinkedUUID())) if (LLGestureMgr::instance().isGestureActive(items.get(i)->getLinkedUUID()))
return true; return true;