diff options
author | Merov Linden <merov@lindenlab.com> | 2013-11-15 15:12:11 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-11-15 15:12:11 -0800 |
commit | 6ec99570cd86a89ed6367f81d6b0cccd7fe0e913 (patch) | |
tree | 5440488d03ad55cfd3bee06a08189790ab7b1888 /indra/llui/llfolderviewmodel.cpp | |
parent | 148c3780e164d5bc94fa14b418e85fee72f9fd39 (diff) |
MAINT-3320 : Fixed! Inventory panels are not resistant to folder root deletion, using handle instead of pointer and cleaning things consistently
Diffstat (limited to 'indra/llui/llfolderviewmodel.cpp')
-rwxr-xr-x | indra/llui/llfolderviewmodel.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/llui/llfolderviewmodel.cpp b/indra/llui/llfolderviewmodel.cpp index 48ca8156f2..3363dc5316 100755 --- a/indra/llui/llfolderviewmodel.cpp +++ b/indra/llui/llfolderviewmodel.cpp @@ -36,10 +36,6 @@ bool LLFolderViewModelCommon::needsSort(LLFolderViewModelItem* item) std::string LLFolderViewModelCommon::getStatusText() { - if (!mFolderView) - { - llinfos << "Merov : Trying LLFolderViewModelCommon::getStatusText() on a NULL mFolderView!!!" << llendl; - } if (!contentsReady() || mFolderView->getViewModelItem()->getLastFilterGeneration() < getFilter().getCurrentGeneration()) { return LLTrans::getString("Searching"); @@ -52,10 +48,6 @@ std::string LLFolderViewModelCommon::getStatusText() void LLFolderViewModelCommon::filter() { - if (!mFolderView) - { - llinfos << "Merov : Trying LLFolderViewModelCommon::filter() on a NULL mFolderView!!!" << llendl; - } getFilter().resetTime(llclamp(LLUI::sSettingGroups["config"]->getS32("FilterItemsMaxTimePerFrameVisible"), 1, 100)); mFolderView->getViewModelItem()->filter(getFilter()); } |