diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-05-07 11:09:04 -0400 |
| commit | a98b4b6bee1b062722ce5eb03948a0fd33b74265 (patch) | |
| tree | 88c030cef0c480f19ab9ff0a187b5c866da3a24a /indra/newview/llinventoryicon.cpp | |
| parent | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (diff) | |
| parent | d0ef02c23a7a37c8c9bfe3a86bae88bb811fc9fe (diff) | |
merge changes for 3.7.7-release
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")); |