diff options
| author | Cinder Biscuits <cinder.roxley@phoenixviewer.com> | 2014-04-27 23:20:12 -0600 |
|---|---|---|
| committer | Cinder Biscuits <cinder.roxley@phoenixviewer.com> | 2014-04-27 23:20:12 -0600 |
| commit | 12ca15d18fd82b85eb38166d1d58cd8803f5c7cf (patch) | |
| tree | feba43a0660b7d63c5cd75fb03041232558c303e /indra/newview/llfolderviewmodelinventory.cpp | |
| parent | 60795c508ee8baa5e21dee7dd990a5276cc02176 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merged lindenlab/viewer-release into default
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 { |