diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-01-03 08:47:03 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-01-03 08:47:03 -0800 |
| commit | cccb3a541c655c15c7578bb50dd762b68ccbfcac (patch) | |
| tree | 724f8a16f9edbaaf461ca034a0ba413384d7c7e0 /indra/newview/llinventorypanel.h | |
| parent | 744e22e3645e205fa3f37ff3532bca607057887f (diff) | |
| parent | d607d81dba25dfe7dd1ecdf123af656ca939924f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llinventorypanel.h')
| -rw-r--r-- | indra/newview/llinventorypanel.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h index 97e1c37a31..b2a60543af 100644 --- a/indra/newview/llinventorypanel.h +++ b/indra/newview/llinventorypanel.h @@ -243,6 +243,8 @@ public: void setSelectionByID(const LLUUID& obj_id, BOOL take_keyboard_focus); void updateSelection(); + void setSuppressOpenItemAction(bool supress_open_item) { mSuppressOpenItemAction = supress_open_item; } + LLFolderViewModelInventory* getFolderViewModel() { return &mInventoryViewModel; } const LLFolderViewModelInventory* getFolderViewModel() const { return &mInventoryViewModel; } @@ -264,6 +266,7 @@ protected: bool mShowItemLinkOverlays; // Shows link graphic over inventory item icons bool mShowEmptyMessage; bool mSuppressFolderMenu; + bool mSuppressOpenItemAction; LLHandle<LLFolderView> mFolderRoot; LLScrollContainer* mScroller; |