diff options
| author | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-03-24 19:23:34 -0700 |
| commit | e5bbdafdeda0f2e6bbe97d59a24ca398b54c31eb (patch) | |
| tree | 359719c76abf090fb8cc5ae912ed013b64cb8fc7 /indra/newview/llinventoryicon.cpp | |
| parent | 31a3a3da5db077c4d9b8fe06a18de98c822db6ab (diff) | |
| parent | 5b846ed2a6dce6c5801aa74d0f36a1c7525fbcba (diff) | |
merge with 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")); |