summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryicon.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-19 07:34:35 -0500
committerOz Linden <oz@lindenlab.com>2011-02-19 07:34:35 -0500
commit19e99a5c09274049d00f25b2d88ee6429747b084 (patch)
treedd0bce45605b1f740dfe210738dda98dc87e7455 /indra/newview/llinventoryicon.h
parent1a79aeca54db6ee5bf1fb2968c2642f8a3306091 (diff)
parent634f152004f4b3938239ec2494030079f695b8ab (diff)
Automated merge with file:///Users/oz/Work/V-D
Diffstat (limited to 'indra/newview/llinventoryicon.h')
-rw-r--r--indra/newview/llinventoryicon.h4
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,