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/newview/llfolderviewmodelinventory.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/newview/llfolderviewmodelinventory.cpp')
| -rwxr-xr-x | indra/newview/llfolderviewmodelinventory.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp index c28657dbcd..aac3a41b9e 100755 --- a/indra/newview/llfolderviewmodelinventory.cpp +++ b/indra/newview/llfolderviewmodelinventory.cpp @@ -232,16 +232,16 @@ bool LLFolderViewModelItemInventory::filter( LLFolderViewFilter& filter) return continue_filtering; } -LLFolderViewModelInventory* LLInventoryPanel::getFolderViewModel() -{ - return &mInventoryViewModel; -} - - -const LLFolderViewModelInventory* LLInventoryPanel::getFolderViewModel() const -{ - return &mInventoryViewModel; -} +//LLFolderViewModelInventory* LLInventoryPanel::getFolderViewModel() +//{ +// return &mInventoryViewModel; +//} +// +// +//const LLFolderViewModelInventory* LLInventoryPanel::getFolderViewModel() const +//{ +// return &mInventoryViewModel; +//} bool LLInventorySort::operator()(const LLFolderViewModelItemInventory* const& a, const LLFolderViewModelItemInventory* const& b) const { |