diff options
author | Oz Linden <oz@lindenlab.com> | 2011-02-19 07:34:35 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-02-19 07:34:35 -0500 |
commit | 19e99a5c09274049d00f25b2d88ee6429747b084 (patch) | |
tree | dd0bce45605b1f740dfe210738dda98dc87e7455 /indra/newview/llinventoryicon.cpp | |
parent | 1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff) | |
parent | 634f152004f4b3938239ec2494030079f695b8ab (diff) |
Automated merge with file:///Users/oz/Work/V-D
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 3f4f33e88d..95dea219a8 100644 --- a/indra/newview/llinventoryicon.cpp +++ b/indra/newview/llinventoryicon.cpp @@ -82,6 +82,8 @@ LLIconDictionary::LLIconDictionary() addEntry(LLInventoryIcon::ICONNAME_ANIMATION, new IconEntry("Inv_Animation")); addEntry(LLInventoryIcon::ICONNAME_GESTURE, new IconEntry("Inv_Gesture")); + addEntry(LLInventoryIcon::ICONNAME_CLOTHING_PHYSICS, new IconEntry("Inv_Physics")); + addEntry(LLInventoryIcon::ICONNAME_LINKITEM, new IconEntry("Inv_LinkItem")); addEntry(LLInventoryIcon::ICONNAME_LINKFOLDER, new IconEntry("Inv_LinkFolder")); |