summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryicon.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-13 11:14:13 -0500
committerOz Linden <oz@lindenlab.com>2011-01-13 11:14:13 -0500
commitb01ca1293b7890ee1e2671f4a9e7b1a77a559a44 (patch)
tree45316409d91dd5cb72e31ae9b53154469380cb99 /indra/newview/llinventoryicon.h
parent55322713fc071a3e171fd4cfbea989945dc8d084 (diff)
parent433ad05ae9580027641c8bd5e1fe175f96669a66 (diff)
merge up to latest viewer-development
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,