summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryicon.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-05-05 17:45:35 -0700
committerRichard Linden <none@none>2013-05-05 17:45:35 -0700
commit6b81b8629e67d82a7620e48781ded73b6e6126ea (patch)
treeb029ca5925dd2eb0f6ccc952bf8d71dd23f45cf1 /indra/newview/llinventoryicon.h
parent41e5bf346eaa0a43646058691cc8090ddfe498e9 (diff)
Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies
Diffstat (limited to 'indra/newview/llinventoryicon.h')
-rw-r--r--indra/newview/llinventoryicon.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h
index c7e2998a20..cbcddc26a9 100644
--- a/indra/newview/llinventoryicon.h
+++ b/indra/newview/llinventoryicon.h
@@ -30,7 +30,6 @@
#include "llassettype.h"
#include "llinventorytype.h"
-#include "lluiimage.h"
class LLInventoryIcon
{
@@ -87,11 +86,11 @@ public:
BOOL item_is_multi = FALSE);
static const std::string& getIconName(EIconName idx);
- static LLUIImagePtr getIcon(LLAssetType::EType asset_type,
+ static LLPointer<class LLUIImage> getIcon(LLAssetType::EType asset_type,
LLInventoryType::EType inventory_type = LLInventoryType::IT_NONE,
U32 misc_flag = 0, // different meanings depending on item type
BOOL item_is_multi = FALSE);
- static LLUIImagePtr getIcon(EIconName idx);
+ static LLPointer<class LLUIImage> getIcon(EIconName idx);
protected:
static EIconName assignWearableIcon(U32 misc_flag);