diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-04 14:28:34 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-04 14:28:34 -0800 |
| commit | c7e2f81bbf299cf884d9e687fc4a7e7f7096c877 (patch) | |
| tree | 1436dbf2dfac1deecee4a2ded9a891b7bf68bfb5 /indra/newview/llfolderviewmodelinventory.cpp | |
| parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) | |
| parent | d2b604c61181a03bb16f2b951b6f86c582860759 (diff) | |
Pull merge from viewer-maint-2287 aka Merchant Outbox
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 { |