diff options
| author | Richard Linden <none@none> | 2011-06-23 11:28:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-23 11:28:23 -0700 |
| commit | 70fc5af53ffc39c3c0ef32b99a6c83e972b8a117 (patch) | |
| tree | ddc8da9d6365611c777c324b38a91f5346c6228e /indra/llcommon | |
| parent | b343d25d19a7d21470027da379c7f16bc7fcb9fc (diff) | |
| parent | 715cb3cc0ca968002af247d0ba67a5d3bed76756 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llfoldertype.cpp | 1 | ||||
| -rw-r--r-- | indra/llcommon/llfoldertype.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp index c2cfb7286e..c6b52e1e3e 100644 --- a/indra/llcommon/llfoldertype.cpp +++ b/indra/llcommon/llfoldertype.cpp @@ -93,6 +93,7 @@ LLFolderDictionary::LLFolderDictionary() addEntry(LLFolderType::FT_MESH, new FolderEntry("mesh", TRUE)); addEntry(LLFolderType::FT_INBOX, new FolderEntry("inbox", TRUE)); + addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", TRUE)); addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE)); }; diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h index cb32cb075b..811e58e2f8 100644 --- a/indra/llcommon/llfoldertype.h +++ b/indra/llcommon/llfoldertype.h @@ -83,8 +83,9 @@ public: FT_MESH = 49, FT_INBOX = 50, + FT_OUTBOX = 51, - FT_COUNT = 51, + FT_COUNT, FT_NONE = -1 }; |