diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-31 16:47:35 -0400 |
commit | 4047349ade461fa6bac43da2a14c6e7689918aa1 (patch) | |
tree | c1414bf26449ede2ff338b8ab286c19b754697fe /indra/newview/llinventoryicon.h | |
parent | 4aad5ee313f580e08f9689b7ff4c4c088c20f831 (diff) | |
parent | 67316ada5a51e1dc1e4d40a805312dddaa653ae2 (diff) |
merge out latest viewer-autobuild2010 changes
Diffstat (limited to 'indra/newview/llinventoryicon.h')
-rw-r--r-- | indra/newview/llinventoryicon.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h index 9a2cc08095..694b56d572 100644 --- a/indra/newview/llinventoryicon.h +++ b/indra/newview/llinventoryicon.h @@ -66,9 +66,11 @@ public: ICONNAME_CLOTHING_SKIRT, ICONNAME_CLOTHING_ALPHA, ICONNAME_CLOTHING_TATTOO, - + ICONNAME_ANIMATION, ICONNAME_GESTURE, + + ICONNAME_CLOTHING_PHYSICS, ICONNAME_LINKITEM, ICONNAME_LINKFOLDER, |