diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:22:25 +0100 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-10 10:22:25 +0100 |
commit | 8a21f5e24145835db65e486bdca5692d2b4d8979 (patch) | |
tree | eff902c19f0892dff1f2f21783a109bc5382155d /indra/newview/llinventoryicon.cpp | |
parent | 3296f3b86452fddc840a3cb140d600fe0d5351dd (diff) | |
parent | 820cffd56df5204e2aa0ceb6ce556a318dfaad7b (diff) |
merge the latest ECC/Shining sprint work. http://bitbucket.org/seraph/viewer-development-shining
Diffstat (limited to 'indra/newview/llinventoryicon.cpp')
-rw-r--r-- | indra/newview/llinventoryicon.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.cpp b/indra/newview/llinventoryicon.cpp index 021790648d..7216d61e7f 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -85,6 +85,8 @@ LLIconDictionary::LLIconDictionary() addEntry(LLInventoryIcon::ICONNAME_LINKITEM, new IconEntry("Inv_LinkItem")); addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, new IconEntry("Inv_LinkItem")); + addEntry(LLInventoryIcon::ICONNAME_INVALID, new IconEntry("Inv_Invalid")); + addEntry(LLInventoryIcon::ICONNAME_NONE, new IconEntry("NONE")); } |