diff options
| author | Richard Linden <none@none> | 2011-06-27 18:44:33 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-06-27 18:44:33 -0700 |
| commit | 4bb8b25bbff5876cafde3a55a7f9a71ee257bee1 (patch) | |
| tree | 5b34067602eadcac4a9b9a078efafbfbf45e09c3 | |
| parent | 019eae669eee8b3f877730b30c4f23b723fb907a (diff) | |
| parent | e733d5c0a96694d7d6879185f88bcc9b0613f39a (diff) | |
merge
| -rw-r--r-- | indra/llcommon/llfoldertype.cpp | 1 | ||||
| -rw-r--r-- | indra/llcommon/llfoldertype.h | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerfoldertype.cpp | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/indra/llcommon/llfoldertype.cpp b/indra/llcommon/llfoldertype.cpp index c6b52e1e3e..39afdac056 100644 --- a/indra/llcommon/llfoldertype.cpp +++ b/indra/llcommon/llfoldertype.cpp @@ -94,6 +94,7 @@ LLFolderDictionary::LLFolderDictionary() addEntry(LLFolderType::FT_INBOX, new FolderEntry("inbox", TRUE)); addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", TRUE)); + addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_root", TRUE)); addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE)); }; diff --git a/indra/llcommon/llfoldertype.h b/indra/llcommon/llfoldertype.h index 811e58e2f8..a0c847914f 100644 --- a/indra/llcommon/llfoldertype.h +++ b/indra/llcommon/llfoldertype.h @@ -85,6 +85,8 @@ public: FT_INBOX = 50, FT_OUTBOX = 51, + FT_BASIC_ROOT = 52, + FT_COUNT, FT_NONE = -1 diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp index 0ddbe8c040..fbd25bc8b4 100644 --- a/indra/newview/llviewerfoldertype.cpp +++ b/indra/newview/llviewerfoldertype.cpp @@ -132,10 +132,12 @@ LLViewerFolderDictionary::LLViewerFolderDictionary() addEntry(LLFolderType::FT_MY_OUTFITS, new ViewerFolderEntry("My Outfits", "Inv_SysOpen", "Inv_SysClosed", TRUE)); addEntry(LLFolderType::FT_MESH, new ViewerFolderEntry("Meshes", "Inv_SysOpen", "Inv_SysClosed", FALSE)); - addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "Inv_SysOpen", "Inv_SysClosed", FALSE, true)); - addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "Inv_SysOpen", "Inv_SysClosed", FALSE, true)); + addEntry(LLFolderType::FT_INBOX, new ViewerFolderEntry("Inbox", "Inv_SysOpen", "Inv_SysClosed", FALSE)); + addEntry(LLFolderType::FT_OUTBOX, new ViewerFolderEntry("Outbox", "Inv_SysOpen", "Inv_SysClosed", FALSE)); + + addEntry(LLFolderType::FT_BASIC_ROOT, new ViewerFolderEntry("Basic Root", "Inv_SysOpen", "Inv_SysClosed", FALSE)); - addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false, "default")); + addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, "default")); #if SUPPORT_ENSEMBLES initEnsemblesFromFile(); |