diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-02-12 15:26:08 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-02-12 15:26:08 -0800 |
| commit | ae39812d704a2b92faf213f1626dbe19a34eceb4 (patch) | |
| tree | c26efa4fb4a033db1d5c65d84fbaade14ec1d756 /indra/newview/llviewerinventory.cpp | |
| parent | c0f2f151b226417152adecb507e6b1b7f2a1f8ce (diff) | |
| parent | 434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 3001992630..b69eaa4853 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -649,6 +649,8 @@ bool LLViewerInventoryCategory::exportFileLocal(LLFILE* fp) const void LLViewerInventoryCategory::determineFolderType() { + /* Do NOT uncomment this code. This is for future 2.1 support of ensembles. + llassert(FALSE); LLFolderType::EType original_type = getPreferredType(); if (LLFolderType::lookupIsProtectedType(original_type)) return; @@ -692,6 +694,8 @@ void LLViewerInventoryCategory::determineFolderType() { changeType(LLFolderType::FT_NONE); } + llassert(FALSE); + */ } void LLViewerInventoryCategory::changeType(LLFolderType::EType new_folder_type) |