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

Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045

Browse Source
This commit is contained in:
Shyotl
2015-06-26 20:59:31 -05:00
parent 4d61305095
commit a380161283
27 changed files with 714 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
indra/newview/llviewerinventory.cpp
View File

@@ -69,6 +69,9 @@
#include "llappviewer.h" // System Folders
bool use_http_inventory(); // UseHTTPInventory replacement
// </edit>
// [RLVa:KB] - Checked: 2014-11-02 (RLVa-1.4.11)
#include "rlvcommon.h"
// [/RLVa:KB]
// do-nothing ops for use in callbacks.
void no_op_inventory_func(const LLUUID&) {}
@@ -939,10 +942,10 @@ void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachme
LLViewerInventoryItem *item = gInventory.getItem(inv_item);
if (item)
{
// rez_attachment(item, attachmentp);
// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.0.0a) | Added: Catznip-2.2.0a
// [SL:KB] - Patch: Appearance-DnDWear | Checked: 2010-09-28 (Catznip-3.4)
rez_attachment(item, attachmentp, replace);
// [/SL:KB]
// rez_attachment(item, attachmentp);
}
}
@@ -1312,15 +1315,35 @@ void update_inventory_item(
const LLSD& updates,
LLPointer<LLInventoryCallback> cb)
{
{
LLPointer<LLViewerInventoryItem> obj = gInventory.getItem(item_id);
LL_DEBUGS(LOG_INV) << "item_id: [" << item_id << "] name " << (obj ? obj->getName() : "(NOT FOUND)") << LL_ENDL;
if(obj)
{
LLPointer<LLViewerInventoryItem> new_item(new LLViewerInventoryItem);
new_item->copyViewerItem(obj);
new_item->fromLLSD(updates,false);
// [SL:KB] - Patch: Appearance-AISFilter | Checked: 2015-03-01 (Catznip-3.7)
LLPointer<LLViewerInventoryItem> obj = gInventory.getItem(item_id);
LL_DEBUGS(LOG_INV) << "item_id: [" << item_id << "] name " << (obj ? obj->getName() : "(NOT FOUND)") << LL_ENDL;
LLPointer<LLViewerInventoryItem> new_item = NULL;
if (obj)
{
new_item->copyViewerItem(obj);
new_item->fromLLSD(updates,false);
LLInventoryModel::LLCategoryUpdate up(new_item->getParentUUID(), 0);
gInventory.accountForUpdate(up);
gInventory.updateItem(new_item);
}
// [/SL:KB]
{
// LLPointer<LLViewerInventoryItem> obj = gInventory.getItem(item_id);
// LL_DEBUGS(LOG_INV) << "item_id: [" << item_id << "] name " << (obj ? obj->getName() : "(NOT FOUND)") << LL_ENDL;
// if(obj)
// {
// LLPointer<LLViewerInventoryItem> new_item(new LLViewerInventoryItem);
// new_item->copyViewerItem(obj);
// new_item->fromLLSD(updates,false);
// [SL:KB] - Patch: Appearance-AISFilter | Checked: 2015-03-01 (Catznip-3.7)
if (new_item)
{
// [/SL:KB]
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_UpdateInventoryItem);
msg->nextBlockFast(_PREHASH_AgentData);
@@ -1332,9 +1355,9 @@ void update_inventory_item(
new_item->packMessage(msg);
gAgent.sendReliableMessage();
LLInventoryModel::LLCategoryUpdate up(new_item->getParentUUID(), 0);
gInventory.accountForUpdate(up);
gInventory.updateItem(new_item);
// LLInventoryModel::LLCategoryUpdate up(new_item->getParentUUID(), 0);
// gInventory.accountForUpdate(up);
// gInventory.updateItem(new_item);
if (cb)
{
cb->fire(item_id);
@@ -1728,23 +1751,100 @@ void create_new_item(const std::string& name,
cb);
}
// [RLVa:KB] - Checked: 2014-11-02 (RLVa-1.4.11)
void sync_inventory_folder(const LLUUID& folder_id, const LLInventoryModel::item_array_t& items, LLInventoryModel::item_array_t& items_to_add, LLInventoryModel::item_array_t& items_to_remove)
{
LLInventoryModel::item_array_t curItems, newItems = items;
// Grab the current contents
LLInventoryModel::cat_array_t cats;
gInventory.collectDescendents(folder_id, cats, curItems, LLInventoryModel::EXCLUDE_TRASH);
// Purge everything in curItems that isn't part of newItems
for (LLInventoryModel::item_array_t::const_iterator itCurItem = curItems.begin(); itCurItem != curItems.end(); ++itCurItem)
{
LLViewerInventoryItem* pItem = *itCurItem;
if (std::find_if(newItems.begin(), newItems.end(), RlvPredIsEqualOrLinkedItem(pItem)) == newItems.end())
{
// Item doesn't exist in newItems => purge (if it's a link)
if ( (pItem->getIsLinkType()) &&
(LLAssetType::AT_LINK_FOLDER != pItem->getActualType()) &&
(items_to_remove.end() == std::find(items_to_remove.begin(), items_to_remove.end(), pItem)) )
{
items_to_remove.push_back(pItem);
}
}
else
{
// Item exists in newItems => remove *all* occurances in newItems (removes duplicate COF links to this item as well)
newItems.erase(std::remove_if(newItems.begin(), newItems.end(), RlvPredIsEqualOrLinkedItem(pItem)), newItems.end());
}
}
// Whatever remains in newItems will need to have a link created
for (LLInventoryModel::item_array_t::const_iterator itNewItem = newItems.begin(); itNewItem != newItems.end(); ++itNewItem)
{
LLViewerInventoryItem* pItem = *itNewItem;
if (items_to_add.end() == std::find(items_to_add.begin(), items_to_add.end(), pItem))
items_to_add.push_back(pItem);
}
}
void link_inventory_items(const LLUUID& folder_id, const LLInventoryModel::item_array_t& items, LLPointer<LLInventoryCallback> cb)
{
for (LLInventoryModel::item_array_t::const_iterator itItem = items.begin(); itItem != items.end(); ++itItem)
{
const LLViewerInventoryItem* pItem = *itItem;
link_inventory_object(folder_id, pItem, cb);
}
}
void remove_inventory_items(const LLInventoryModel::item_array_t& items, LLPointer<LLInventoryCallback> cb)
{
for (LLInventoryModel::item_array_t::const_iterator itItem = items.begin(); itItem != items.end(); ++itItem)
{
const LLViewerInventoryItem* pItem = *itItem;
if (pItem->getIsLinkType())
remove_inventory_item(pItem->getUUID(), cb);
}
}
// [/RLVa:KB]
void slam_inventory_folder(const LLUUID& folder_id,
const LLSD& contents,
LLPointer<LLInventoryCallback> cb)
{
{
// [RLVa:KB] - Checked: 2014-11-02 (RLVa-1.4.11)
LL_DEBUGS(LOG_INV) << "using item-by-item calls to slam folder, id " << folder_id
<< " new contents: " << ll_pretty_print_sd(contents) << LL_ENDL;
for (LLSD::array_const_iterator it = contents.beginArray();
it != contents.endArray();
++it)
LLInventoryModel::item_array_t items;
for (LLSD::array_const_iterator itItem = contents.beginArray(); itItem != contents.endArray(); ++itItem)
{
const LLSD& item_contents = *it;
LLViewerInventoryItem *item = new LLViewerInventoryItem;
item->fromLLSD(item_contents);
link_inventory_object(folder_id, item, cb);
LLViewerInventoryItem* pItem = new LLViewerInventoryItem;
pItem->fromLLSD(*itItem);
items.push_back(pItem);
}
remove_folder_contents(folder_id,false,cb);
LLInventoryModel::item_array_t items_to_add, items_to_remove;
sync_inventory_folder(folder_id, items, items_to_add, items_to_remove);
link_inventory_items(folder_id, items_to_add, cb);
remove_inventory_items(items_to_remove, cb);
// [/RLVa:KB]
// LL_DEBUGS(LOG_INV) << "using item-by-item calls to slam folder, id " << folder_id
// << " new contents: " << ll_pretty_print_sd(contents) << LL_ENDL;
// for (LLSD::array_const_iterator it = contents.beginArray();
// it != contents.endArray();
// ++it)
// {
// const LLSD& item_contents = *it;
// LLViewerInventoryItem *item = new LLViewerInventoryItem;
// item->fromLLSD(item_contents);
// link_inventory_object(folder_id, item, cb);
// }
// remove_folder_contents(folder_id,false,cb);
}
}