diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-21 15:02:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-21 15:02:03 -0400 |
| commit | c118ec209907618c77613990fe2359d4f92802e6 (patch) | |
| tree | b2fa95d1fa1563cdee89d2bf035b680c64918c0f /indra/llcommon/llfoldertype.h | |
| parent | 54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff) | |
| parent | 67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff) | |
merge up changes for 2.8.0 release
Diffstat (limited to 'indra/llcommon/llfoldertype.h')
| -rw-r--r-- | indra/llcommon/llfoldertype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h index cb32cb075b..a0c847914f 100644 --- a/indra/llcommon/llfoldertype.h +++ b/indra/llcommon/llfoldertype.h @@ -83,8 +83,11 @@ public: FT_MESH = 49, FT_INBOX = 50, + FT_OUTBOX = 51, - FT_COUNT = 51, + FT_BASIC_ROOT = 52, + + FT_COUNT, FT_NONE = -1 }; |