summaryrefslogtreecommitdiff
path: root/indra/newview/llappearancemgr.cpp
diff options
context:
space:
mode:
authorAndrey Kleshchev <117672381+akleshchev@users.noreply.github.com>2024-06-27 18:57:02 +0300
committerGitHub <noreply@github.com>2024-06-27 18:57:02 +0300
commitac0f56668b42bbd01396633bbfd6dbda7ea434a5 (patch)
treedbb724773d49b1397e192e38770543fff4cf85f2 /indra/newview/llappearancemgr.cpp
parentfcffbad09007185becf53f2a259701c7e07444f5 (diff)
parent6ee6d19f600bb7fee99f96e8476e2c57088dad17 (diff)
Merge pull request #1840 from secondlife/inventory_favorites
viewer#1300 viewer#1301 viewer#1424 viewer#1425 viewer#1619 viewer#1005
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
-rw-r--r--indra/newview/llappearancemgr.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index b01f12ee83..b825bd9f41 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2042,7 +2042,7 @@ bool LLAppearanceMgr::getCanReplaceCOF(const LLUUID& outfit_cat_id)
}
// Moved from LLWearableList::ContextMenu for wider utility.
-bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids) const
+bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids, bool warn_on_type_mismatch) const
{
// TODO: investigate wearables may not be loaded at this point EXT-8231
@@ -2072,7 +2072,10 @@ bool LLAppearanceMgr::canAddWearables(const uuid_vec_t& item_ids) const
}
else
{
- LL_WARNS() << "Unexpected wearable type" << LL_ENDL;
+ if (warn_on_type_mismatch)
+ {
+ LL_WARNS() << "Unexpected wearable type" << LL_ENDL;
+ }
return false;
}
}