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

fix line endings

meow-7.2.2
maxim_productengine 2018-05-02 16:15:43 +03:00
parent d5435765e2
commit 22a33cc8d7
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llinventorybridge.cpp
View File

@ -3807,10 +3807,10 @@ void LLFolderBridge::perform_pasteFromClipboard()
break;
}
}
else if (item->getIsLinkType())
{
link_inventory_object(parent_id, item_id,
LLPointer<LLInventoryCallback>(NULL));
else if (item->getIsLinkType())
{
link_inventory_object(parent_id, item_id,
LLPointer<LLInventoryCallback>(NULL));
}
else
{

6
indra/newview/llinventoryfunctions.cpp
View File

@ -425,9 +425,9 @@ void copy_inventory_category(LLInventoryModel* model,
LLInventoryItem* item = *iter;
LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(update_folder_cb, new_cat_uuid));
if (item->getIsLinkType())
{
link_inventory_object(new_cat_uuid, item->getLinkedUUID(), cb);
if (item->getIsLinkType())
{
link_inventory_object(new_cat_uuid, item->getLinkedUUID(), cb);
}
else if(!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID(), gAgent.getGroupID()))
{