diff options
author | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-05-08 14:00:55 -0700 |
commit | 37bfd025aeef7292abb1708577eee80b6e1b91d5 (patch) | |
tree | 3dab7c728f3a4b67eae30cbbf838dec8747c5e6e /indra/newview/llinventoryicon.cpp | |
parent | 1cf659d4481983684c4d5d749d95d56832dbc621 (diff) | |
parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) |
viewer-release merge (to 3.7.8)
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
-rwxr-xr-x | indra/newview/llinventoryicon.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 02a2475cfd..b7c4ec6f8b 100755 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -32,6 +32,7 @@ #include "lldictionary.h" #include "llinventorydefines.h" #include "llui.h" +#include "lluiimage.h" #include "llwearabletype.h" struct IconEntry : public LLDictionaryEntry @@ -49,6 +50,8 @@ public: LLIconDictionary(); }; +typedef LLPointer<LLUIImage> LLUIImagePtr; + LLIconDictionary::LLIconDictionary() { addEntry(LLInventoryType::ICONNAME_TEXTURE, new IconEntry("Inv_Texture")); |