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

Linuxy fixes

Browse Source
This commit is contained in:
Siana Gearz
2011-08-01 19:55:57 +02:00
parent f30c284063
commit fcd37f3a45
15 changed files with 114 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llinventorybridge.cpp
View File

@@ -1653,7 +1653,7 @@ BOOL LLFolderBridge::isItemRemovable()
return FALSE;
}
if ( (LLAssetType::AT_NONE != category->getPreferredType()) && (LLFolderType::FT_OUTFIT != category->getPreferredType()) )
if ( (LLFolderType::FT_NONE != category->getPreferredType()) && (LLFolderType::FT_OUTFIT != category->getPreferredType()) )
{
return FALSE;
}
@@ -1666,7 +1666,7 @@ BOOL LLFolderBridge::isItemRemovable()
for( i = 0; i < descendent_categories.count(); i++ )
{
LLInventoryCategory* category = descendent_categories[i];
if( LLAssetType::AT_NONE != category->getPreferredType() )
if( LLFolderType::FT_NONE != category->getPreferredType() )
{
return FALSE;
}
@@ -1792,7 +1792,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
const LLUUID& cat_id = inv_cat->getUUID();
const LLUUID &trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH, false);
const BOOL move_is_into_trash = (mUUID == trash_id) || model->isObjectDescendentOf(mUUID, trash_id);
BOOL is_movable = (LLAssetType::AT_NONE == inv_cat->getPreferredType());
BOOL is_movable = (LLFolderType::FT_NONE == inv_cat->getPreferredType());
if( is_movable )
{
LLInventoryModel::cat_array_t descendent_categories;