diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-23 11:38:33 -0400 |
| commit | 551d17f819ea3dbcdc61cb41a458ab6d893d28cf (patch) | |
| tree | 130c90ed3b0f6a4245af843cf9170130d549dc4f /indra/newview/llinventoryicon.h | |
| parent | 99fe1004a6cb4406bcac790420a5be6269e02723 (diff) | |
| parent | e5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff) | |
merge latest changes (post-2.7.0) from viewer-development
Diffstat (limited to 'indra/newview/llinventoryicon.h')
| -rw-r--r-- | indra/newview/llinventoryicon.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llinventoryicon.h b/indra/newview/llinventoryicon.h index 694b56d572..c7e2998a20 100644 --- a/indra/newview/llinventoryicon.h +++ b/indra/newview/llinventoryicon.h @@ -74,6 +74,7 @@ public: ICONNAME_LINKITEM, ICONNAME_LINKFOLDER, + ICONNAME_MESH, ICONNAME_INVALID, ICONNAME_COUNT, |