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

Comment out unused changes from STORM-2091 that has been fixed by LL differently in the meantime

meow-7.2.2
Ansariel 2017-01-02 12:37:16 +01:00
parent bacf1557bb
commit d1b97e2523
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llpanelmaininventory.cpp
View File

@ -1607,20 +1607,22 @@ bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
{
const std::string command_name = userdata.asString();
if (command_name == "not_empty")
{
BOOL status = FALSE;
LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
if (current_item)
{
const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
LLInventoryModel::cat_array_t* cat_array;
LLInventoryModel::item_array_t* item_array;
gInventory.getDirectDescendentsOf(item_id, cat_array, item_array);
status = (0 == cat_array->size() && 0 == item_array->size());
}
return status;
}
// <FS:Ansariel> Unused changes from STORM-2091 that has been fixed by LL differently in the meantime
//if (command_name == "not_empty")
//{
// BOOL status = FALSE;
// LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
// if (current_item)
// {
// const LLUUID& item_id = static_cast<LLFolderViewModelItemInventory*>(current_item->getViewModelItem())->getUUID();
// LLInventoryModel::cat_array_t* cat_array;
// LLInventoryModel::item_array_t* item_array;
// gInventory.getDirectDescendentsOf(item_id, cat_array, item_array);
// status = (0 == cat_array->size() && 0 == item_array->size());
// }
// return status;
//}
// </FS:Ansariel>
if (command_name == "delete")
{
return getActivePanel()->isSelectionRemovable();