diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-08-18 15:34:09 +0000 |
| commit | ac1b723fd79b63a9dab94c839d3c0acb2ddde129 (patch) | |
| tree | 4da36d5bae02191ce86dea8b5b074b48f516a3ae /indra/newview/llinventorybridge.h | |
| parent | d53725ece11eb3403128dd77834742a1d084138f (diff) | |
svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-6 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
This merges in all appearance side panel bug fixes.
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 5cfebe6c15..3af54c52ea 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -76,6 +76,9 @@ enum EInventoryIcon ANIMATION_ICON_NAME, GESTURE_ICON_NAME, + LINKITEM_ICON_NAME, + LINKFOLDER_ICON_NAME, + ICON_NAME_COUNT }; |