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/llfolderviewitem.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'indra/newview/llfolderviewitem.cpp') diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index 3946224c0c..76607e4874 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1855,10 +1855,9 @@ EInventorySortGroup LLFolderViewFolder::getSortGroup() const return SG_TRASH_FOLDER; } - // Folders that can't be moved are 'system' folders. if( mListener ) { - if( !(mListener->isItemMovable()) ) + if(LLFolderType::lookupIsProtectedType(mListener->getPreferredType())) { return SG_SYSTEM_FOLDER; } -- cgit v1.2.3