diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-06-08 10:57:49 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-06-08 10:57:49 -0700 |
| commit | ce2fc7d775d313a7dfe528b9c09a1d03ad077b50 (patch) | |
| tree | 40ffdfa0e44a8ad12c35940f4f62ab5cc5fdaeca /indra/newview/llinventorypanel.h | |
| parent | dde75d76210c9e4df0516b89f8f199fe081a5e87 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rwxr-xr-x | indra/newview/llinventorypanel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index a490dfce5d..bc4c10e441 100755 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -43,6 +43,7 @@ class LLInvFVBridge; class LLInventoryFolderViewModelBuilder; class LLInvPanelComplObserver; class LLFolderViewModelInventory; +class LLFolderViewGroupedItemBridge; namespace LLInitParam { @@ -240,6 +241,7 @@ protected: LLScrollContainer* mScroller; LLFolderViewModelInventory mInventoryViewModel; + LLPointer<LLFolderViewGroupedItemBridge> mGroupedItemBridge; Params mParams; // stored copy of parameter block std::map<LLUUID, LLFolderViewItem*> mItemMap; |