From dce57c6b80b1286889da1a6cadda05c864a31851 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Fri, 12 Feb 2010 17:13:05 -0500 Subject: EXT-5297 : System folders no longer sort properly in Snowglobe (and Emerald) inventory windows EXT-5399 : Ensemble folder typing code has been reenabled and is mangling inventory folders This fixes two issues: 1. A very serious issue where ensemble auto-typing code was somehow uncommented/reintroduced into viewer2. This randomly changes folder types (sometimes into what older viewers will treat as system folders; i.e. you can't delete or move them). 2. A minor issue where sorting was not correctly identifying what was a system folder or not. --- indra/newview/llviewerinventory.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llviewerinventory.cpp') 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) -- cgit v1.2.3