summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryobserver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llinventoryobserver.cpp')
-rw-r--r--indra/newview/llinventoryobserver.cpp974
1 files changed, 487 insertions, 487 deletions
diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp
index 15cd7957a2..1c76c154a1 100644
--- a/indra/newview/llinventoryobserver.cpp
+++ b/indra/newview/llinventoryobserver.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llinventoryobserver.cpp
* @brief Implementation of the inventory observers used to track agent inventory.
*
* $LicenseInfo:firstyear=2002&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2010, Linden Research, Inc.
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation;
* version 2.1 of the License only.
- *
+ *
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
* $/LicenseInfo$
*/
@@ -73,94 +73,94 @@ LLInventoryObserver::~LLInventoryObserver()
LLInventoryFetchObserver::LLInventoryFetchObserver(const LLUUID& id)
{
- mIDs.clear();
- if (id != LLUUID::null)
- {
- setFetchID(id);
- }
+ mIDs.clear();
+ if (id != LLUUID::null)
+ {
+ setFetchID(id);
+ }
}
LLInventoryFetchObserver::LLInventoryFetchObserver(const uuid_vec_t& ids)
{
- setFetchIDs(ids);
+ setFetchIDs(ids);
}
BOOL LLInventoryFetchObserver::isFinished() const
{
- return mIncomplete.empty();
+ return mIncomplete.empty();
}
void LLInventoryFetchObserver::setFetchIDs(const uuid_vec_t& ids)
{
- mIDs = ids;
+ mIDs = ids;
}
void LLInventoryFetchObserver::setFetchID(const LLUUID& id)
{
- mIDs.clear();
- mIDs.push_back(id);
+ mIDs.clear();
+ mIDs.push_back(id);
}
void LLInventoryCompletionObserver::changed(U32 mask)
{
- // scan through the incomplete items and move or erase them as
- // appropriate.
- if (!mIncomplete.empty())
- {
- for (uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end(); )
- {
- const LLViewerInventoryItem* item = gInventory.getItem(*it);
- if (!item)
- {
- it = mIncomplete.erase(it);
- continue;
- }
- if (item->isFinished())
- {
- mComplete.push_back(*it);
- it = mIncomplete.erase(it);
- continue;
- }
- ++it;
- }
- if (mIncomplete.empty())
- {
- done();
- }
- }
+ // scan through the incomplete items and move or erase them as
+ // appropriate.
+ if (!mIncomplete.empty())
+ {
+ for (uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end(); )
+ {
+ const LLViewerInventoryItem* item = gInventory.getItem(*it);
+ if (!item)
+ {
+ it = mIncomplete.erase(it);
+ continue;
+ }
+ if (item->isFinished())
+ {
+ mComplete.push_back(*it);
+ it = mIncomplete.erase(it);
+ continue;
+ }
+ ++it;
+ }
+ if (mIncomplete.empty())
+ {
+ done();
+ }
+ }
}
void LLInventoryCompletionObserver::watchItem(const LLUUID& id)
{
- if (id.notNull())
- {
- mIncomplete.push_back(id);
- }
+ if (id.notNull())
+ {
+ mIncomplete.push_back(id);
+ }
}
LLInventoryFetchItemsObserver::LLInventoryFetchItemsObserver(const LLUUID& item_id) :
- LLInventoryFetchObserver(item_id)
+ LLInventoryFetchObserver(item_id)
{
- mIDs.clear();
- mIDs.push_back(item_id);
+ mIDs.clear();
+ mIDs.push_back(item_id);
}
LLInventoryFetchItemsObserver::LLInventoryFetchItemsObserver(const uuid_vec_t& item_ids) :
- LLInventoryFetchObserver(item_ids)
+ LLInventoryFetchObserver(item_ids)
{
}
void LLInventoryFetchItemsObserver::changed(U32 mask)
{
LL_DEBUGS("InventoryFetch") << this << " remaining incomplete " << mIncomplete.size()
- << " complete " << mComplete.size()
- << " wait period " << mFetchingPeriod.getRemainingTimeF32()
- << LL_ENDL;
-
- // scan through the incomplete items and move or erase them as
- // appropriate.
- if (!mIncomplete.empty())
- {
+ << " complete " << mComplete.size()
+ << " wait period " << mFetchingPeriod.getRemainingTimeF32()
+ << LL_ENDL;
+
+ // scan through the incomplete items and move or erase them as
+ // appropriate.
+ if (!mIncomplete.empty())
+ {
if (!LLInventoryModelBackgroundFetch::getInstance()->isEverythingFetched())
{
// Folders have a priority over items and they download items as well
@@ -171,106 +171,106 @@ void LLInventoryFetchItemsObserver::changed(U32 mask)
mFetchingPeriod.setTimerExpirySec(FETCH_TIMER_EXPIRY);
}
- // Have we exceeded max wait time?
- bool timeout_expired = mFetchingPeriod.hasExpired();
-
- for (uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end(); )
- {
- const LLUUID& item_id = (*it);
- LLViewerInventoryItem* item = gInventory.getItem(item_id);
- if (item && item->isFinished())
- {
- mComplete.push_back(item_id);
- it = mIncomplete.erase(it);
- }
- else
- {
- if (timeout_expired)
- {
- // Just concede that this item hasn't arrived in reasonable time and continue on.
+ // Have we exceeded max wait time?
+ bool timeout_expired = mFetchingPeriod.hasExpired();
+
+ for (uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end(); )
+ {
+ const LLUUID& item_id = (*it);
+ LLViewerInventoryItem* item = gInventory.getItem(item_id);
+ if (item && item->isFinished())
+ {
+ mComplete.push_back(item_id);
+ it = mIncomplete.erase(it);
+ }
+ else
+ {
+ if (timeout_expired)
+ {
+ // Just concede that this item hasn't arrived in reasonable time and continue on.
LL_WARNS("InventoryFetch") << "Fetcher timed out when fetching inventory item UUID: " << item_id << LL_ENDL;
- it = mIncomplete.erase(it);
- }
- else
- {
- // Keep trying.
- ++it;
- }
- }
- }
-
- }
-
- if (mIncomplete.empty())
- {
+ it = mIncomplete.erase(it);
+ }
+ else
+ {
+ // Keep trying.
+ ++it;
+ }
+ }
+ }
+
+ }
+
+ if (mIncomplete.empty())
+ {
LL_DEBUGS("InventoryFetch") << this << " done at remaining incomplete "
- << mIncomplete.size() << " complete " << mComplete.size() << LL_ENDL;
- done();
- }
- //LL_INFOS() << "LLInventoryFetchItemsObserver::changed() mComplete size " << mComplete.size() << LL_ENDL;
- //LL_INFOS() << "LLInventoryFetchItemsObserver::changed() mIncomplete size " << mIncomplete.size() << LL_ENDL;
+ << mIncomplete.size() << " complete " << mComplete.size() << LL_ENDL;
+ done();
+ }
+ //LL_INFOS() << "LLInventoryFetchItemsObserver::changed() mComplete size " << mComplete.size() << LL_ENDL;
+ //LL_INFOS() << "LLInventoryFetchItemsObserver::changed() mIncomplete size " << mIncomplete.size() << LL_ENDL;
}
void fetch_items_from_llsd(const LLSD& items_llsd)
{
- if (!items_llsd.size() || gDisconnected) return;
-
- LLSD body;
- body[0]["cap_name"] = "FetchInventory2";
- body[1]["cap_name"] = "FetchLib2";
- for (S32 i=0; i<items_llsd.size();i++)
- {
- if (items_llsd[i]["owner_id"].asString() == gAgent.getID().asString())
- {
- body[0]["items"].append(items_llsd[i]);
- continue;
- }
- else if (items_llsd[i]["owner_id"].asString() == ALEXANDRIA_LINDEN_ID.asString())
- {
- body[1]["items"].append(items_llsd[i]);
- continue;
- }
- }
-
- for (S32 i=0; i<body.size(); i++)
- {
- if (!gAgent.getRegion())
- {
- LL_WARNS() << "Agent's region is null" << LL_ENDL;
- break;
- }
-
- if (0 == body[i]["items"].size()) {
- LL_DEBUGS() << "Skipping body with no items to fetch" << LL_ENDL;
- continue;
- }
-
- std::string url = gAgent.getRegion()->getCapability(body[i]["cap_name"].asString());
- if (!url.empty())
- {
- body[i]["agent_id"] = gAgent.getID();
+ if (!items_llsd.size() || gDisconnected) return;
+
+ LLSD body;
+ body[0]["cap_name"] = "FetchInventory2";
+ body[1]["cap_name"] = "FetchLib2";
+ for (S32 i=0; i<items_llsd.size();i++)
+ {
+ if (items_llsd[i]["owner_id"].asString() == gAgent.getID().asString())
+ {
+ body[0]["items"].append(items_llsd[i]);
+ continue;
+ }
+ else if (items_llsd[i]["owner_id"].asString() == ALEXANDRIA_LINDEN_ID.asString())
+ {
+ body[1]["items"].append(items_llsd[i]);
+ continue;
+ }
+ }
+
+ for (S32 i=0; i<body.size(); i++)
+ {
+ if (!gAgent.getRegion())
+ {
+ LL_WARNS() << "Agent's region is null" << LL_ENDL;
+ break;
+ }
+
+ if (0 == body[i]["items"].size()) {
+ LL_DEBUGS() << "Skipping body with no items to fetch" << LL_ENDL;
+ continue;
+ }
+
+ std::string url = gAgent.getRegion()->getCapability(body[i]["cap_name"].asString());
+ if (!url.empty())
+ {
+ body[i]["agent_id"] = gAgent.getID();
LLCore::HttpHandler::ptr_t handler(new LLInventoryModel::FetchItemHttpHandler(body[i]));
- gInventory.requestPost(true, url, body[i], handler, (i ? "Library Item" : "Inventory Item"));
- continue;
- }
+ gInventory.requestPost(true, url, body[i], handler, (i ? "Library Item" : "Inventory Item"));
+ continue;
+ }
else
{
LL_WARNS("INVENTORY") << "Failed to get capability." << LL_ENDL;
}
- }
+ }
}
void LLInventoryFetchItemsObserver::startFetch()
{
bool aisv3 = AISAPI::isAvailable();
- LLSD items_llsd;
+ LLSD items_llsd;
typedef std::map<LLUUID, uuid_vec_t> requests_by_folders_t;
requests_by_folders_t requests;
- for (uuid_vec_t::const_iterator it = mIDs.begin(); it < mIDs.end(); ++it)
- {
+ for (uuid_vec_t::const_iterator it = mIDs.begin(); it < mIDs.end(); ++it)
+ {
LLViewerInventoryItem* item = gInventory.getItem(*it);
if (item && item->isFinished())
{
@@ -279,24 +279,24 @@ void LLInventoryFetchItemsObserver::startFetch()
continue;
}
- // Ignore categories since they're not items. We
- // could also just add this to mComplete but not sure what the
- // side-effects would be, so ignoring to be safe.
- LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
- if (cat)
- {
- continue;
- }
+ // Ignore categories since they're not items. We
+ // could also just add this to mComplete but not sure what the
+ // side-effects would be, so ignoring to be safe.
+ LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
+ if (cat)
+ {
+ continue;
+ }
- if ((*it).isNull())
- {
- LL_WARNS("Inventory") << "Skip fetching for a NULL uuid" << LL_ENDL;
- continue;
- }
+ if ((*it).isNull())
+ {
+ LL_WARNS("Inventory") << "Skip fetching for a NULL uuid" << LL_ENDL;
+ continue;
+ }
- // It's incomplete, so put it on the incomplete container, and
- // pack this on the message.
- mIncomplete.push_back(*it);
+ // It's incomplete, so put it on the incomplete container, and
+ // pack this on the message.
+ mIncomplete.push_back(*it);
if (aisv3)
{
@@ -328,10 +328,10 @@ void LLInventoryFetchItemsObserver::startFetch()
item_entry["item_id"] = (*it);
items_llsd.append(item_entry);
}
- }
+ }
- mFetchingPeriod.reset();
- mFetchingPeriod.setTimerExpirySec(FETCH_TIMER_EXPIRY);
+ mFetchingPeriod.reset();
+ mFetchingPeriod.setTimerExpirySec(FETCH_TIMER_EXPIRY);
if (aisv3)
{
@@ -389,34 +389,34 @@ void LLInventoryFetchItemsObserver::startFetch()
}
LLInventoryFetchDescendentsObserver::LLInventoryFetchDescendentsObserver(const LLUUID& cat_id) :
- LLInventoryFetchObserver(cat_id)
+ LLInventoryFetchObserver(cat_id)
{
}
LLInventoryFetchDescendentsObserver::LLInventoryFetchDescendentsObserver(const uuid_vec_t& cat_ids) :
- LLInventoryFetchObserver(cat_ids)
+ LLInventoryFetchObserver(cat_ids)
{
}
// virtual
void LLInventoryFetchDescendentsObserver::changed(U32 mask)
{
- for (uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end();)
- {
- const LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
- if (!cat)
- {
- it = mIncomplete.erase(it);
- continue;
- }
- if (isCategoryComplete(cat))
- {
- mComplete.push_back(*it);
- it = mIncomplete.erase(it);
- continue;
- }
- ++it;
- }
+ for (uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end();)
+ {
+ const LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
+ if (!cat)
+ {
+ it = mIncomplete.erase(it);
+ continue;
+ }
+ if (isCategoryComplete(cat))
+ {
+ mComplete.push_back(*it);
+ it = mIncomplete.erase(it);
+ continue;
+ }
+ ++it;
+ }
if (mIncomplete.empty())
{
@@ -437,180 +437,180 @@ void LLInventoryFetchDescendentsObserver::changed(U32 mask)
void LLInventoryFetchDescendentsObserver::startFetch()
{
- for (uuid_vec_t::const_iterator it = mIDs.begin(); it != mIDs.end(); ++it)
- {
- LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
- if (!cat) continue;
- if (!isCategoryComplete(cat))
- {
+ for (uuid_vec_t::const_iterator it = mIDs.begin(); it != mIDs.end(); ++it)
+ {
+ LLViewerInventoryCategory* cat = gInventory.getCategory(*it);
+ if (!cat) continue;
+ if (!isCategoryComplete(cat))
+ {
//blindly fetch it without seeing if anything else is fetching it.
LLInventoryModelBackgroundFetch::getInstance()->scheduleFolderFetch(*it, true);
- mIncomplete.push_back(*it); //Add to list of things being downloaded for this observer.
- }
- else
- {
- mComplete.push_back(*it);
- }
- }
+ mIncomplete.push_back(*it); //Add to list of things being downloaded for this observer.
+ }
+ else
+ {
+ mComplete.push_back(*it);
+ }
+ }
}
BOOL LLInventoryFetchDescendentsObserver::isCategoryComplete(const LLViewerInventoryCategory* cat) const
{
- const S32 version = cat->getVersion();
- const S32 expected_num_descendents = cat->getDescendentCount();
- if ((version == LLViewerInventoryCategory::VERSION_UNKNOWN) ||
- (expected_num_descendents == LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN))
- {
- return FALSE;
- }
- // it might be complete - check known descendents against
- // currently available.
- LLInventoryModel::cat_array_t* cats;
- LLInventoryModel::item_array_t* items;
- gInventory.getDirectDescendentsOf(cat->getUUID(), cats, items);
- if (!cats || !items)
- {
- LL_WARNS() << "Category '" << cat->getName() << "' descendents corrupted, fetch failed." << LL_ENDL;
- // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
- // that the cat just doesn't have any items or subfolders).
- // Unrecoverable, so just return done so that this observer can be cleared
- // from memory.
- return TRUE;
- }
- const S32 current_num_known_descendents = cats->size() + items->size();
-
- // Got the number of descendents that we were expecting, so we're done.
- if (current_num_known_descendents == expected_num_descendents)
- {
- return TRUE;
- }
-
- // Error condition, but recoverable. This happens if something was added to the
- // category before it was initialized, so accountForUpdate didn't update descendent
- // count and thus the category thinks it has fewer descendents than it actually has.
- if (current_num_known_descendents >= expected_num_descendents)
- {
- LL_WARNS() << "Category '" << cat->getName() << "' expected descendentcount:" << expected_num_descendents << " descendents but got descendentcount:" << current_num_known_descendents << LL_ENDL;
- const_cast<LLViewerInventoryCategory *>(cat)->setDescendentCount(current_num_known_descendents);
- return TRUE;
- }
- return FALSE;
+ const S32 version = cat->getVersion();
+ const S32 expected_num_descendents = cat->getDescendentCount();
+ if ((version == LLViewerInventoryCategory::VERSION_UNKNOWN) ||
+ (expected_num_descendents == LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN))
+ {
+ return FALSE;
+ }
+ // it might be complete - check known descendents against
+ // currently available.
+ LLInventoryModel::cat_array_t* cats;
+ LLInventoryModel::item_array_t* items;
+ gInventory.getDirectDescendentsOf(cat->getUUID(), cats, items);
+ if (!cats || !items)
+ {
+ LL_WARNS() << "Category '" << cat->getName() << "' descendents corrupted, fetch failed." << LL_ENDL;
+ // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
+ // that the cat just doesn't have any items or subfolders).
+ // Unrecoverable, so just return done so that this observer can be cleared
+ // from memory.
+ return TRUE;
+ }
+ const S32 current_num_known_descendents = cats->size() + items->size();
+
+ // Got the number of descendents that we were expecting, so we're done.
+ if (current_num_known_descendents == expected_num_descendents)
+ {
+ return TRUE;
+ }
+
+ // Error condition, but recoverable. This happens if something was added to the
+ // category before it was initialized, so accountForUpdate didn't update descendent
+ // count and thus the category thinks it has fewer descendents than it actually has.
+ if (current_num_known_descendents >= expected_num_descendents)
+ {
+ LL_WARNS() << "Category '" << cat->getName() << "' expected descendentcount:" << expected_num_descendents << " descendents but got descendentcount:" << current_num_known_descendents << LL_ENDL;
+ const_cast<LLViewerInventoryCategory *>(cat)->setDescendentCount(current_num_known_descendents);
+ return TRUE;
+ }
+ return FALSE;
}
LLInventoryFetchComboObserver::LLInventoryFetchComboObserver(const uuid_vec_t& folder_ids,
- const uuid_vec_t& item_ids)
+ const uuid_vec_t& item_ids)
{
- mFetchDescendents = new LLInventoryFetchDescendentsObserver(folder_ids);
+ mFetchDescendents = new LLInventoryFetchDescendentsObserver(folder_ids);
- uuid_vec_t pruned_item_ids;
- for (uuid_vec_t::const_iterator item_iter = item_ids.begin();
- item_iter != item_ids.end();
- ++item_iter)
- {
- const LLUUID& item_id = (*item_iter);
- const LLViewerInventoryItem* item = gInventory.getItem(item_id);
- if (item && std::find(folder_ids.begin(), folder_ids.end(), item->getParentUUID()) == folder_ids.end())
- {
- continue;
- }
- pruned_item_ids.push_back(item_id);
- }
+ uuid_vec_t pruned_item_ids;
+ for (uuid_vec_t::const_iterator item_iter = item_ids.begin();
+ item_iter != item_ids.end();
+ ++item_iter)
+ {
+ const LLUUID& item_id = (*item_iter);
+ const LLViewerInventoryItem* item = gInventory.getItem(item_id);
+ if (item && std::find(folder_ids.begin(), folder_ids.end(), item->getParentUUID()) == folder_ids.end())
+ {
+ continue;
+ }
+ pruned_item_ids.push_back(item_id);
+ }
- mFetchItems = new LLInventoryFetchItemsObserver(pruned_item_ids);
- mFetchDescendents = new LLInventoryFetchDescendentsObserver(folder_ids);
+ mFetchItems = new LLInventoryFetchItemsObserver(pruned_item_ids);
+ mFetchDescendents = new LLInventoryFetchDescendentsObserver(folder_ids);
}
LLInventoryFetchComboObserver::~LLInventoryFetchComboObserver()
{
- mFetchItems->done();
- mFetchDescendents->done();
- delete mFetchItems;
- delete mFetchDescendents;
+ mFetchItems->done();
+ mFetchDescendents->done();
+ delete mFetchItems;
+ delete mFetchDescendents;
}
void LLInventoryFetchComboObserver::changed(U32 mask)
{
- mFetchItems->changed(mask);
- mFetchDescendents->changed(mask);
- if (mFetchItems->isFinished() && mFetchDescendents->isFinished())
- {
- done();
- }
+ mFetchItems->changed(mask);
+ mFetchDescendents->changed(mask);
+ if (mFetchItems->isFinished() && mFetchDescendents->isFinished())
+ {
+ done();
+ }
}
void LLInventoryFetchComboObserver::startFetch()
{
- mFetchItems->startFetch();
- mFetchDescendents->startFetch();
+ mFetchItems->startFetch();
+ mFetchDescendents->startFetch();
}
// See comment preceding LLInventoryAddedObserver::changed() for some
// concerns that also apply to this observer.
void LLInventoryAddItemByAssetObserver::changed(U32 mask)
{
- if(!(mask & LLInventoryObserver::ADD) ||
- !(mask & LLInventoryObserver::CREATE) ||
- !(mask & LLInventoryObserver::UPDATE_CREATE))
- {
- return;
- }
-
- // nothing is watched
- if (mWatchedAssets.size() == 0)
- {
- return;
- }
-
- const uuid_set_t& added = gInventory.getAddedIDs();
- for (uuid_set_t::iterator it = added.begin(); it != added.end(); ++it)
- {
- LLInventoryItem *item = gInventory.getItem(*it);
+ if(!(mask & LLInventoryObserver::ADD) ||
+ !(mask & LLInventoryObserver::CREATE) ||
+ !(mask & LLInventoryObserver::UPDATE_CREATE))
+ {
+ return;
+ }
+
+ // nothing is watched
+ if (mWatchedAssets.size() == 0)
+ {
+ return;
+ }
+
+ const uuid_set_t& added = gInventory.getAddedIDs();
+ for (uuid_set_t::iterator it = added.begin(); it != added.end(); ++it)
+ {
+ LLInventoryItem *item = gInventory.getItem(*it);
if (!item)
{
continue;
}
- const LLUUID& asset_uuid = item->getAssetUUID();
- if (item->getUUID().notNull() && asset_uuid.notNull())
- {
- if (isAssetWatched(asset_uuid))
- {
- LL_DEBUGS("Inventory_Move") << "Found asset UUID: " << asset_uuid << LL_ENDL;
- mAddedItems.push_back(item->getUUID());
- }
- }
- }
-
- if (mAddedItems.size() == mWatchedAssets.size())
- {
- LL_DEBUGS("Inventory_Move") << "All watched items are added & processed." << LL_ENDL;
- done();
- mAddedItems.clear();
-
- // Unable to clean watched items here due to somebody can require to check them in current frame.
- // set dirty state to clean them while next watch cycle.
- mIsDirty = true;
- }
+ const LLUUID& asset_uuid = item->getAssetUUID();
+ if (item->getUUID().notNull() && asset_uuid.notNull())
+ {
+ if (isAssetWatched(asset_uuid))
+ {
+ LL_DEBUGS("Inventory_Move") << "Found asset UUID: " << asset_uuid << LL_ENDL;
+ mAddedItems.push_back(item->getUUID());
+ }
+ }
+ }
+
+ if (mAddedItems.size() == mWatchedAssets.size())
+ {
+ LL_DEBUGS("Inventory_Move") << "All watched items are added & processed." << LL_ENDL;
+ done();
+ mAddedItems.clear();
+
+ // Unable to clean watched items here due to somebody can require to check them in current frame.
+ // set dirty state to clean them while next watch cycle.
+ mIsDirty = true;
+ }
}
void LLInventoryAddItemByAssetObserver::watchAsset(const LLUUID& asset_id)
{
- if(asset_id.notNull())
- {
- if (mIsDirty)
- {
- LL_DEBUGS("Inventory_Move") << "Watched items are dirty. Clean them." << LL_ENDL;
- mWatchedAssets.clear();
- mIsDirty = false;
- }
+ if(asset_id.notNull())
+ {
+ if (mIsDirty)
+ {
+ LL_DEBUGS("Inventory_Move") << "Watched items are dirty. Clean them." << LL_ENDL;
+ mWatchedAssets.clear();
+ mIsDirty = false;
+ }
- mWatchedAssets.push_back(asset_id);
- onAssetAdded(asset_id);
- }
+ mWatchedAssets.push_back(asset_id);
+ onAssetAdded(asset_id);
+ }
}
bool LLInventoryAddItemByAssetObserver::isAssetWatched( const LLUUID& asset_id )
{
- return std::find(mWatchedAssets.begin(), mWatchedAssets.end(), asset_id) != mWatchedAssets.end();
+ return std::find(mWatchedAssets.begin(), mWatchedAssets.end(), asset_id) != mWatchedAssets.end();
}
// This observer used to explicitly check for whether it was being
@@ -627,120 +627,120 @@ bool LLInventoryAddItemByAssetObserver::isAssetWatched( const LLUUID& asset_id )
// UpdateCreateInventoryItem and the other doesn't.
void LLInventoryAddedObserver::changed(U32 mask)
{
- if (!(mask & LLInventoryObserver::ADD) ||
- !(mask & LLInventoryObserver::CREATE) ||
- !(mask & LLInventoryObserver::UPDATE_CREATE))
- {
- return;
- }
+ if (!(mask & LLInventoryObserver::ADD) ||
+ !(mask & LLInventoryObserver::CREATE) ||
+ !(mask & LLInventoryObserver::UPDATE_CREATE))
+ {
+ return;
+ }
- if (!gInventory.getAddedIDs().empty())
- {
- done();
- }
+ if (!gInventory.getAddedIDs().empty())
+ {
+ done();
+ }
}
void LLInventoryCategoryAddedObserver::changed(U32 mask)
{
- if (!(mask & LLInventoryObserver::ADD))
- {
- return;
- }
-
- const LLInventoryModel::changed_items_t& added_ids = gInventory.getAddedIDs();
-
- for (LLInventoryModel::changed_items_t::const_iterator cit = added_ids.begin(); cit != added_ids.end(); ++cit)
- {
- LLViewerInventoryCategory* cat = gInventory.getCategory(*cit);
-
- if (cat)
- {
- mAddedCategories.push_back(cat);
- }
- }
-
- if (!mAddedCategories.empty())
- {
- done();
-
- mAddedCategories.clear();
- }
+ if (!(mask & LLInventoryObserver::ADD))
+ {
+ return;
+ }
+
+ const LLInventoryModel::changed_items_t& added_ids = gInventory.getAddedIDs();
+
+ for (LLInventoryModel::changed_items_t::const_iterator cit = added_ids.begin(); cit != added_ids.end(); ++cit)
+ {
+ LLViewerInventoryCategory* cat = gInventory.getCategory(*cit);
+
+ if (cat)
+ {
+ mAddedCategories.push_back(cat);
+ }
+ }
+
+ if (!mAddedCategories.empty())
+ {
+ done();
+
+ mAddedCategories.clear();
+ }
}
void LLInventoryCategoriesObserver::changed(U32 mask)
{
- if (!mCategoryMap.size())
- return;
+ if (!mCategoryMap.size())
+ return;
+
+ std::vector<LLUUID> deleted_categories_ids;
- std::vector<LLUUID> deleted_categories_ids;
+ for (category_map_t::iterator iter = mCategoryMap.begin();
+ iter != mCategoryMap.end();
+ ++iter)
+ {
+ const LLUUID& cat_id = (*iter).first;
+ LLCategoryData& cat_data = (*iter).second;
- for (category_map_t::iterator iter = mCategoryMap.begin();
- iter != mCategoryMap.end();
- ++iter)
- {
- const LLUUID& cat_id = (*iter).first;
- LLCategoryData& cat_data = (*iter).second;
-
- LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
- if (!category)
+ LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
+ if (!category)
{
LL_WARNS() << "Category : Category id = " << cat_id << " disappeared" << LL_ENDL;
- cat_data.mCallback();
+ cat_data.mCallback();
// Keep track of those deleted categories so we can remove them
deleted_categories_ids.push_back(cat_id);
- continue;
- }
-
- const S32 version = category->getVersion();
- const S32 expected_num_descendents = category->getDescendentCount();
- if ((version == LLViewerInventoryCategory::VERSION_UNKNOWN) ||
- (expected_num_descendents == LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN))
- {
- continue;
- }
-
- // Check number of known descendents to find out whether it has changed.
- LLInventoryModel::cat_array_t* cats;
- LLInventoryModel::item_array_t* items;
- gInventory.getDirectDescendentsOf(cat_id, cats, items);
- if (!cats || !items)
- {
- LL_WARNS() << "Category '" << category->getName() << "' descendents corrupted, fetch failed." << LL_ENDL;
- // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
- // that the cat just doesn't have any items or subfolders).
- // Unrecoverable, so just skip this category.
-
- llassert(cats != NULL && items != NULL);
-
- continue;
- }
-
- const S32 current_num_known_descendents = cats->size() + items->size();
-
- bool cat_changed = false;
-
- // If category version or descendents count has changed
- // update category data in mCategoryMap
- if (version != cat_data.mVersion || current_num_known_descendents != cat_data.mDescendentsCount)
- {
- cat_data.mVersion = version;
- cat_data.mDescendentsCount = current_num_known_descendents;
- cat_changed = true;
- }
-
- // If any item names have changed, update the name hash
- // Only need to check if (a) name hash has not previously been
- // computed, or (b) a name has changed.
- if (!cat_data.mIsNameHashInitialized || (mask & LLInventoryObserver::LABEL))
- {
- digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
- if (cat_data.mItemNameHash != item_name_hash)
- {
- cat_data.mIsNameHashInitialized = true;
- cat_data.mItemNameHash = item_name_hash;
- cat_changed = true;
- }
- }
+ continue;
+ }
+
+ const S32 version = category->getVersion();
+ const S32 expected_num_descendents = category->getDescendentCount();
+ if ((version == LLViewerInventoryCategory::VERSION_UNKNOWN) ||
+ (expected_num_descendents == LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN))
+ {
+ continue;
+ }
+
+ // Check number of known descendents to find out whether it has changed.
+ LLInventoryModel::cat_array_t* cats;
+ LLInventoryModel::item_array_t* items;
+ gInventory.getDirectDescendentsOf(cat_id, cats, items);
+ if (!cats || !items)
+ {
+ LL_WARNS() << "Category '" << category->getName() << "' descendents corrupted, fetch failed." << LL_ENDL;
+ // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
+ // that the cat just doesn't have any items or subfolders).
+ // Unrecoverable, so just skip this category.
+
+ llassert(cats != NULL && items != NULL);
+
+ continue;
+ }
+
+ const S32 current_num_known_descendents = cats->size() + items->size();
+
+ bool cat_changed = false;
+
+ // If category version or descendents count has changed
+ // update category data in mCategoryMap
+ if (version != cat_data.mVersion || current_num_known_descendents != cat_data.mDescendentsCount)
+ {
+ cat_data.mVersion = version;
+ cat_data.mDescendentsCount = current_num_known_descendents;
+ cat_changed = true;
+ }
+
+ // If any item names have changed, update the name hash
+ // Only need to check if (a) name hash has not previously been
+ // computed, or (b) a name has changed.
+ if (!cat_data.mIsNameHashInitialized || (mask & LLInventoryObserver::LABEL))
+ {
+ digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
+ if (cat_data.mItemNameHash != item_name_hash)
+ {
+ cat_data.mIsNameHashInitialized = true;
+ cat_data.mItemNameHash = item_name_hash;
+ cat_changed = true;
+ }
+ }
const LLUUID thumbnail_id = category->getThumbnailUUID();
if (cat_data.mThumbnailId != thumbnail_id)
@@ -749,118 +749,118 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
cat_changed = true;
}
- // If anything has changed above, fire the callback.
- if (cat_changed)
- cat_data.mCallback();
- }
-
+ // If anything has changed above, fire the callback.
+ if (cat_changed)
+ cat_data.mCallback();
+ }
+
// Remove deleted categories from the list
- for (std::vector<LLUUID>::iterator deleted_id = deleted_categories_ids.begin(); deleted_id != deleted_categories_ids.end(); ++deleted_id)
- {
- removeCategory(*deleted_id);
+ for (std::vector<LLUUID>::iterator deleted_id = deleted_categories_ids.begin(); deleted_id != deleted_categories_ids.end(); ++deleted_id)
+ {
+ removeCategory(*deleted_id);
}
}
bool LLInventoryCategoriesObserver::addCategory(const LLUUID& cat_id, callback_t cb, bool init_name_hash)
{
- S32 version = LLViewerInventoryCategory::VERSION_UNKNOWN;
- S32 current_num_known_descendents = LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN;
- bool can_be_added = true;
+ S32 version = LLViewerInventoryCategory::VERSION_UNKNOWN;
+ S32 current_num_known_descendents = LLViewerInventoryCategory::DESCENDENT_COUNT_UNKNOWN;
+ bool can_be_added = true;
LLUUID thumbnail_id;
- LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
- // If category could not be retrieved it might mean that
- // inventory is unusable at the moment so the category is
- // stored with VERSION_UNKNOWN and DESCENDENT_COUNT_UNKNOWN,
- // it may be updated later.
- if (category)
- {
- // Inventory category version is used to find out if some changes
- // to a category have been made.
- version = category->getVersion();
+ LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
+ // If category could not be retrieved it might mean that
+ // inventory is unusable at the moment so the category is
+ // stored with VERSION_UNKNOWN and DESCENDENT_COUNT_UNKNOWN,
+ // it may be updated later.
+ if (category)
+ {
+ // Inventory category version is used to find out if some changes
+ // to a category have been made.
+ version = category->getVersion();
thumbnail_id = category->getThumbnailUUID();
- LLInventoryModel::cat_array_t* cats;
- LLInventoryModel::item_array_t* items;
- gInventory.getDirectDescendentsOf(cat_id, cats, items);
- if (!cats || !items)
- {
- LL_WARNS() << "Category '" << category->getName() << "' descendents corrupted, fetch failed." << LL_ENDL;
- // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
- // that the cat just doesn't have any items or subfolders).
- // Unrecoverable, so just return "false" meaning that the category can't be observed.
- can_be_added = false;
-
- llassert(cats != NULL && items != NULL);
- }
- else
- {
- current_num_known_descendents = cats->size() + items->size();
- }
- }
-
- if (can_be_added)
- {
- if(init_name_hash)
- {
- digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
- mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents,item_name_hash)));
- }
- else
- {
- mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents)));
- }
- }
-
- return can_be_added;
+ LLInventoryModel::cat_array_t* cats;
+ LLInventoryModel::item_array_t* items;
+ gInventory.getDirectDescendentsOf(cat_id, cats, items);
+ if (!cats || !items)
+ {
+ LL_WARNS() << "Category '" << category->getName() << "' descendents corrupted, fetch failed." << LL_ENDL;
+ // NULL means the call failed -- cats/items map doesn't exist (note: this does NOT mean
+ // that the cat just doesn't have any items or subfolders).
+ // Unrecoverable, so just return "false" meaning that the category can't be observed.
+ can_be_added = false;
+
+ llassert(cats != NULL && items != NULL);
+ }
+ else
+ {
+ current_num_known_descendents = cats->size() + items->size();
+ }
+ }
+
+ if (can_be_added)
+ {
+ if(init_name_hash)
+ {
+ digest_t item_name_hash = gInventory.hashDirectDescendentNames(cat_id);
+ mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents,item_name_hash)));
+ }
+ else
+ {
+ mCategoryMap.insert(category_map_value_t(cat_id,LLCategoryData(cat_id, thumbnail_id, cb, version, current_num_known_descendents)));
+ }
+ }
+
+ return can_be_added;
}
void LLInventoryCategoriesObserver::removeCategory(const LLUUID& cat_id)
{
- mCategoryMap.erase(cat_id);
+ mCategoryMap.erase(cat_id);
}
LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
- const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents)
-
- : mCatID(cat_id)
- , mCallback(cb)
- , mVersion(version)
- , mDescendentsCount(num_descendents)
+ const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents)
+
+ : mCatID(cat_id)
+ , mCallback(cb)
+ , mVersion(version)
+ , mDescendentsCount(num_descendents)
, mThumbnailId(thumbnail_id)
- , mIsNameHashInitialized(false)
+ , mIsNameHashInitialized(false)
{
}
LLInventoryCategoriesObserver::LLCategoryData::LLCategoryData(
- const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash)
+ const LLUUID& cat_id, const LLUUID& thumbnail_id, callback_t cb, S32 version, S32 num_descendents, const digest_t& name_hash)
- : mCatID(cat_id)
- , mCallback(cb)
- , mVersion(version)
- , mDescendentsCount(num_descendents)
+ : mCatID(cat_id)
+ , mCallback(cb)
+ , mVersion(version)
+ , mDescendentsCount(num_descendents)
, mThumbnailId(thumbnail_id)
- , mIsNameHashInitialized(true)
- , mItemNameHash(name_hash)
+ , mIsNameHashInitialized(true)
+ , mItemNameHash(name_hash)
{
}
void LLScrollOnRenameObserver::changed(U32 mask)
{
- if (mask & LLInventoryObserver::LABEL)
- {
- const uuid_set_t& changed_item_ids = gInventory.getChangedIDs();
- for (uuid_set_t::const_iterator it = changed_item_ids.begin(); it != changed_item_ids.end(); ++it)
- {
- const LLUUID& id = *it;
- if (id == mUUID)
- {
- mView->scrollToShowSelection();
-
- gInventory.removeObserver(this);
- delete this;
- return;
- }
- }
- }
+ if (mask & LLInventoryObserver::LABEL)
+ {
+ const uuid_set_t& changed_item_ids = gInventory.getChangedIDs();
+ for (uuid_set_t::const_iterator it = changed_item_ids.begin(); it != changed_item_ids.end(); ++it)
+ {
+ const LLUUID& id = *it;
+ if (id == mUUID)
+ {
+ mView->scrollToShowSelection();
+
+ gInventory.removeObserver(this);
+ delete this;
+ return;
+ }
+ }
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 16:14:45 +0000