From 7796fc674802fa217791f3229c4166eb8b0e6138 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 16 Dec 2009 16:36:40 -0500 Subject: EXT-3527 : Centralize calls to getIsItemWorn Moved function from llinventorybridge to llinventoryfunctions. --HG-- branch : avatar-pipeline --- indra/newview/llinventoryfunctions.h | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'indra/newview/llinventoryfunctions.h') diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index 9916a2351c..1ff1b9a066 100644 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -41,7 +41,9 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // This is a collection of miscellaneous functions and classes -// that don't fit cleanly into any other class header. +// that don't fit cleanly into any other class header. Eventually, +// we should figure out where to put these functions so that we can +// get rid of this generic file. // //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -98,14 +100,17 @@ public: }; const std::string& get_item_icon_name(LLAssetType::EType asset_type, - LLInventoryType::EType inventory_type, - U32 attachment_point, - BOOL item_is_multi ); + LLInventoryType::EType inventory_type, + U32 attachment_point, + BOOL item_is_multi ); LLUIImagePtr get_item_icon(LLAssetType::EType asset_type, - LLInventoryType::EType inventory_type, - U32 attachment_point, - BOOL item_is_multi ); + LLInventoryType::EType inventory_type, + U32 attachment_point, + BOOL item_is_multi ); + +// Is it worn, attached, etc... +BOOL get_is_item_worn(const LLUUID& id); #endif // LL_LLINVENTORYFUNCTIONS_H -- cgit v1.2.3 From 95bbee6b0e2016ea22de6ed439210bc6faf0f77d Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Wed, 16 Dec 2009 17:02:02 -0500 Subject: EXT-3527 : Centralize calls to getIsItemWorn Changed more functions to use get_is_item_worn. --HG-- branch : avatar-pipeline --- indra/newview/llinventoryfunctions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llinventoryfunctions.h') diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h index 1ff1b9a066..968db84819 100644 --- a/indra/newview/llinventoryfunctions.h +++ b/indra/newview/llinventoryfunctions.h @@ -109,7 +109,7 @@ LLUIImagePtr get_item_icon(LLAssetType::EType asset_type, U32 attachment_point, BOOL item_is_multi ); -// Is it worn, attached, etc... +// Is this item or its baseitem is worn, attached, etc... BOOL get_is_item_worn(const LLUUID& id); #endif // LL_LLINVENTORYFUNCTIONS_H -- cgit v1.2.3