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/llfolderviewitem.cpp | |
| parent | c0f2f151b226417152adecb507e6b1b7f2a1f8ce (diff) | |
| parent | 434436ef6b96f74eaf0daf687c6978d5a24d5be7 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llfolderviewitem.cpp')
| -rw-r--r-- | indra/newview/llfolderviewitem.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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; } |