diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-06-26 15:27:34 -0400 |
| commit | 3f52cefcc4b4cc00caef56a40e0da1ea981a3073 (patch) | |
| tree | 7697fdea468261e1cd266eed1ba37ecab08c1e16 /indra/newview/llinventorypanel.h | |
| parent | 33c88a1c6037290924691db59c6538a370946ea4 (diff) | |
| parent | 687efd84eabc524e339e61458b0cbf53f9a38f8a (diff) | |
MAINT-5232: merge LLError::Log::demangle() to tip
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; |