aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linden/indra/newview/llinventorymodel.cpp56
1 files changed, 28 insertions, 28 deletions
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 1c7a049..5c1ae22 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -404,7 +404,7 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
404 404
405 if(preferred_type == LLAssetType::AT_SIMSTATE) 405 if(preferred_type == LLAssetType::AT_SIMSTATE)
406 { 406 {
407 lldebugs << "Attempt to create simstate category." << llendl; 407 LL_DEBUGS("Inventory") << "Attempt to create simstate category." << LL_ENDL;
408 return id; 408 return id;
409 } 409 }
410 410
@@ -761,7 +761,7 @@ void LLInventoryModel::updateCategory(const LLViewerInventoryCategory* cat)
761 761
762void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id) 762void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
763{ 763{
764 lldebugs << "LLInventoryModel::moveObject()" << llendl; 764 LL_DEBUGS("Inventory") << "LLInventoryModel::moveObject()" << LL_ENDL;
765 if(!isInventoryUsable()) 765 if(!isInventoryUsable())
766 { 766 {
767 llwarns << "Inventory is broken." << llendl; 767 llwarns << "Inventory is broken." << llendl;
@@ -803,11 +803,11 @@ void LLInventoryModel::moveObject(const LLUUID& object_id, const LLUUID& cat_id)
803// Delete a particular inventory object by ID. 803// Delete a particular inventory object by ID.
804void LLInventoryModel::deleteObject(const LLUUID& id) 804void LLInventoryModel::deleteObject(const LLUUID& id)
805{ 805{
806 lldebugs << "LLInventoryModel::deleteObject()" << llendl; 806 LL_DEBUGS("Inventory") << "LLInventoryModel::deleteObject()" << LL_ENDL;
807 LLPointer<LLInventoryObject> obj = getObject(id); 807 LLPointer<LLInventoryObject> obj = getObject(id);
808 if(obj) 808 if(obj)
809 { 809 {
810 lldebugs << "Deleting inventory object " << id << llendl; 810 LL_DEBUGS("Inventory") << "Deleting inventory object " << id << LL_ENDL;
811 mLastItem = NULL; 811 mLastItem = NULL;
812 LLUUID parent_id = obj->getParentUUID(); 812 LLUUID parent_id = obj->getParentUUID();
813 mCategoryMap.erase(id); 813 mCategoryMap.erase(id);
@@ -1103,8 +1103,8 @@ void LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
1103 LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem; 1103 LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
1104 titem->unpackMessage(content["items"][i]); 1104 titem->unpackMessage(content["items"][i]);
1105 1105
1106 lldebugs << "LLInventoryModel::messageUpdateCore() item id:" 1106 LL_DEBUGS("Inventory") << "LLInventoryModel::messageUpdateCore() item id:"
1107 << titem->getUUID() << llendl; 1107 << titem->getUUID() << LL_ENDL;
1108 items.push_back(titem); 1108 items.push_back(titem);
1109 // examine update for changes. 1109 // examine update for changes.
1110 LLViewerInventoryItem* itemp = gInventory.getItem(titem->getUUID()); 1110 LLViewerInventoryItem* itemp = gInventory.getItem(titem->getUUID());
@@ -1673,8 +1673,8 @@ void LLInventoryModel::cache(
1673 const LLUUID& parent_folder_id, 1673 const LLUUID& parent_folder_id,
1674 const LLUUID& agent_id) 1674 const LLUUID& agent_id)
1675{ 1675{
1676 lldebugs << "Caching " << parent_folder_id << " for " << agent_id 1676 LL_DEBUGS("Inventory") << "Caching " << parent_folder_id << " for " << agent_id
1677 << llendl; 1677 << LL_ENDL;
1678 LLViewerInventoryCategory* root_cat = getCategory(parent_folder_id); 1678 LLViewerInventoryCategory* root_cat = getCategory(parent_folder_id);
1679 if(!root_cat) return; 1679 if(!root_cat) return;
1680 cat_array_t categories; 1680 cat_array_t categories;
@@ -1699,7 +1699,7 @@ void LLInventoryModel::cache(
1699 gzip_filename.append(".gz"); 1699 gzip_filename.append(".gz");
1700 if(gzip_file(inventory_filename, gzip_filename)) 1700 if(gzip_file(inventory_filename, gzip_filename))
1701 { 1701 {
1702 lldebugs << "Successfully compressed " << inventory_filename << llendl; 1702 LL_DEBUGS("Inventory") << "Successfully compressed " << inventory_filename << LL_ENDL;
1703 LLFile::remove(inventory_filename); 1703 LLFile::remove(inventory_filename);
1704 } 1704 }
1705 else 1705 else
@@ -1781,8 +1781,8 @@ void LLInventoryModel::accountForUpdate(const LLCategoryUpdate& update)
1781 } 1781 }
1782 if(!accounted) 1782 if(!accounted)
1783 { 1783 {
1784 lldebugs << "No accounting for: '" << cat->getName() << "' " 1784 LL_DEBUGS("Inventory") << "No accounting for: '" << cat->getName() << "' "
1785 << version << llendl; 1785 << version << LL_ENDL;
1786 } 1786 }
1787 } 1787 }
1788 else 1788 else
@@ -1918,7 +1918,7 @@ bool LLInventoryModel::loadSkeleton(
1918 const LLInventoryModel::options_t& options, 1918 const LLInventoryModel::options_t& options,
1919 const LLUUID& owner_id) 1919 const LLUUID& owner_id)
1920{ 1920{
1921 lldebugs << "importing inventory skeleton for " << owner_id << llendl; 1921 LL_DEBUGS("Inventory") << "importing inventory skeleton for " << owner_id << LL_ENDL;
1922 1922
1923 typedef std::set<LLPointer<LLViewerInventoryCategory>, InventoryIDPtrLess> cat_set_t; 1923 typedef std::set<LLPointer<LLViewerInventoryCategory>, InventoryIDPtrLess> cat_set_t;
1924 cat_set_t temp_cats; 1924 cat_set_t temp_cats;
@@ -2709,8 +2709,8 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
2709 { 2709 {
2710 LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem; 2710 LLPointer<LLViewerInventoryItem> titem = new LLViewerInventoryItem;
2711 titem->unpackMessage(msg, _PREHASH_InventoryData, i); 2711 titem->unpackMessage(msg, _PREHASH_InventoryData, i);
2712 lldebugs << "LLInventoryModel::messageUpdateCore() item id:" 2712 LL_DEBUGS("Inventory") << "LLInventoryModel::messageUpdateCore() item id:"
2713 << titem->getUUID() << llendl; 2713 << titem->getUUID() << LL_ENDL;
2714 items.push_back(titem); 2714 items.push_back(titem);
2715 // examine update for changes. 2715 // examine update for changes.
2716 LLViewerInventoryItem* itemp = gInventory.getItem(titem->getUUID()); 2716 LLViewerInventoryItem* itemp = gInventory.getItem(titem->getUUID());
@@ -2759,7 +2759,7 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
2759// static 2759// static
2760void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**) 2760void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**)
2761{ 2761{
2762 lldebugs << "LLInventoryModel::processRemoveInventoryItem()" << llendl; 2762 LL_DEBUGS("Inventory") << "LLInventoryModel::processRemoveInventoryItem()" << LL_ENDL;
2763 LLUUID agent_id, item_id; 2763 LLUUID agent_id, item_id;
2764 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id); 2764 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
2765 if(agent_id != gAgent.getID()) 2765 if(agent_id != gAgent.getID())
@@ -2796,7 +2796,7 @@ void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**)
2796void LLInventoryModel::processUpdateInventoryFolder(LLMessageSystem* msg, 2796void LLInventoryModel::processUpdateInventoryFolder(LLMessageSystem* msg,
2797 void**) 2797 void**)
2798{ 2798{
2799 lldebugs << "LLInventoryModel::processUpdateInventoryFolder()" << llendl; 2799 LL_DEBUGS("Inventory") << "LLInventoryModel::processUpdateInventoryFolder()" << LL_ENDL;
2800 LLUUID agent_id, folder_id, parent_id; 2800 LLUUID agent_id, folder_id, parent_id;
2801 //char name[DB_INV_ITEM_NAME_BUF_SIZE]; 2801 //char name[DB_INV_ITEM_NAME_BUF_SIZE];
2802 msg->getUUIDFast(_PREHASH_FolderData, _PREHASH_AgentID, agent_id); 2802 msg->getUUIDFast(_PREHASH_FolderData, _PREHASH_AgentID, agent_id);
@@ -2856,7 +2856,7 @@ void LLInventoryModel::processUpdateInventoryFolder(LLMessageSystem* msg,
2856void LLInventoryModel::processRemoveInventoryFolder(LLMessageSystem* msg, 2856void LLInventoryModel::processRemoveInventoryFolder(LLMessageSystem* msg,
2857 void**) 2857 void**)
2858{ 2858{
2859 lldebugs << "LLInventoryModel::processRemoveInventoryFolder()" << llendl; 2859 LL_DEBUGS("Inventory") << "LLInventoryModel::processRemoveInventoryFolder()" << LL_ENDL;
2860 LLUUID agent_id, folder_id; 2860 LLUUID agent_id, folder_id;
2861 msg->getUUIDFast(_PREHASH_FolderData, _PREHASH_AgentID, agent_id); 2861 msg->getUUIDFast(_PREHASH_FolderData, _PREHASH_AgentID, agent_id);
2862 if(agent_id != gAgent.getID()) 2862 if(agent_id != gAgent.getID())
@@ -2905,8 +2905,8 @@ void LLInventoryModel::processSaveAssetIntoInventory(LLMessageSystem* msg,
2905 // The viewer ignores the asset id because this message is only 2905 // The viewer ignores the asset id because this message is only
2906 // used for attachments/objects, so the asset id is not used in 2906 // used for attachments/objects, so the asset id is not used in
2907 // the viewer anyway. 2907 // the viewer anyway.
2908 lldebugs << "LLInventoryModel::processSaveAssetIntoInventory itemID=" 2908 LL_DEBUGS("Inventory") << "LLInventoryModel::processSaveAssetIntoInventory itemID="
2909 << item_id << llendl; 2909 << item_id << LL_ENDL;
2910 LLViewerInventoryItem* item = gInventory.getItem( item_id ); 2910 LLViewerInventoryItem* item = gInventory.getItem( item_id );
2911 if( item ) 2911 if( item )
2912 { 2912 {
@@ -3173,7 +3173,7 @@ void LLInventoryModel::processInventoryDescendents(LLMessageSystem* msg,void**)
3173// static 3173// static
3174void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**) 3174void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
3175{ 3175{
3176 lldebugs << "LLInventoryModel::processMoveInventoryItem()" << llendl; 3176 LL_DEBUGS("Inventory") << "LLInventoryModel::processMoveInventoryItem()" << LL_ENDL;
3177 LLUUID agent_id; 3177 LLUUID agent_id;
3178 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id); 3178 msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id);
3179 if(agent_id != gAgent.getID()) 3179 if(agent_id != gAgent.getID())
@@ -3198,8 +3198,8 @@ void LLInventoryModel::processMoveInventoryItem(LLMessageSystem* msg, void**)
3198 msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_FolderID, folder_id, i); 3198 msg->getUUIDFast(_PREHASH_InventoryData, _PREHASH_FolderID, folder_id, i);
3199 msg->getString("InventoryData", "NewName", new_name, i); 3199 msg->getString("InventoryData", "NewName", new_name, i);
3200 3200
3201 lldebugs << "moving item " << item_id << " to folder " 3201 LL_DEBUGS("Inventory") << "moving item " << item_id << " to folder "
3202 << folder_id << llendl; 3202 << folder_id << LL_ENDL;
3203 update_list_t update; 3203 update_list_t update;
3204 LLCategoryUpdate old_folder(item->getParentUUID(), -1); 3204 LLCategoryUpdate old_folder(item->getParentUUID(), -1);
3205 update.push_back(old_folder); 3205 update.push_back(old_folder);
@@ -3759,7 +3759,7 @@ void LLInventoryFetchComboObserver::fetch(
3759 const folder_ref_t& folder_ids, 3759 const folder_ref_t& folder_ids,
3760 const item_ref_t& item_ids) 3760 const item_ref_t& item_ids)
3761{ 3761{
3762 lldebugs << "LLInventoryFetchComboObserver::fetch()" << llendl; 3762 LL_DEBUGS("Inventory") << "LLInventoryFetchComboObserver::fetch()" << LL_ENDL;
3763 for(folder_ref_t::const_iterator fit = folder_ids.begin(); fit != folder_ids.end(); ++fit) 3763 for(folder_ref_t::const_iterator fit = folder_ids.begin(); fit != folder_ids.end(); ++fit)
3764 { 3764 {
3765 LLViewerInventoryCategory* cat = gInventory.getCategory(*fit); 3765 LLViewerInventoryCategory* cat = gInventory.getCategory(*fit);
@@ -3767,13 +3767,13 @@ void LLInventoryFetchComboObserver::fetch(
3767 if(!gInventory.isCategoryComplete(*fit)) 3767 if(!gInventory.isCategoryComplete(*fit))
3768 { 3768 {
3769 cat->fetchDescendents(); 3769 cat->fetchDescendents();
3770 lldebugs << "fetching folder " << *fit <<llendl; 3770 LL_DEBUGS("Inventory") << "fetching folder " << *fit << LL_ENDL;
3771 mIncompleteFolders.push_back(*fit); 3771 mIncompleteFolders.push_back(*fit);
3772 } 3772 }
3773 else 3773 else
3774 { 3774 {
3775 mCompleteFolders.push_back(*fit); 3775 mCompleteFolders.push_back(*fit);
3776 lldebugs << "completing folder " << *fit <<llendl; 3776 LL_DEBUGS("Inventory") << "completing folder " << *fit << LL_ENDL;
3777 } 3777 }
3778 } 3778 }
3779 3779
@@ -3788,14 +3788,14 @@ void LLInventoryFetchComboObserver::fetch(
3788 LLViewerInventoryItem* item = gInventory.getItem(*iit); 3788 LLViewerInventoryItem* item = gInventory.getItem(*iit);
3789 if(!item) 3789 if(!item)
3790 { 3790 {
3791 lldebugs << "uanble to find item " << *iit << llendl; 3791 LL_DEBUGS("Inventory") << "uanble to find item " << *iit << LL_ENDL;
3792 continue; 3792 continue;
3793 } 3793 }
3794 if(item->isComplete()) 3794 if(item->isComplete())
3795 { 3795 {
3796 // It's complete, so put it on the complete container. 3796 // It's complete, so put it on the complete container.
3797 mCompleteItems.push_back(*iit); 3797 mCompleteItems.push_back(*iit);
3798 lldebugs << "completing item " << *iit << llendl; 3798 LL_DEBUGS("Inventory") << "completing item " << *iit << LL_ENDL;
3799 continue; 3799 continue;
3800 } 3800 }
3801 else 3801 else
@@ -3812,7 +3812,7 @@ void LLInventoryFetchComboObserver::fetch(
3812 } 3812 }
3813 else 3813 else
3814 { 3814 {
3815 lldebugs << "not worrying about " << *iit << llendl; 3815 LL_DEBUGS("Inventory") << "not worrying about " << *iit << LL_ENDL;
3816 } 3816 }
3817 } 3817 }
3818 fetch_items_from_llsd(items_llsd); 3818 fetch_items_from_llsd(items_llsd);
generated by cgit v1.1 at 2025-04-01 08:32:08 +0000