diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-10 13:22:55 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-10 13:22:55 -0800 |
| commit | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (patch) | |
| tree | 910dbc7db40ddae4c66ad24e9b25346771500a75 /indra/newview/llfavoritesbar.h | |
| parent | 95445fb1b56a60145933db0891133230c87274b8 (diff) | |
| parent | 426744df2c9a6c04bab594fefbd8b35970d0948d (diff) | |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llfavoritesbar.h')
| -rw-r--r-- | indra/newview/llfavoritesbar.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfavoritesbar.h b/indra/newview/llfavoritesbar.h index 37645523f6..1a28731c4f 100644 --- a/indra/newview/llfavoritesbar.h +++ b/indra/newview/llfavoritesbar.h @@ -91,13 +91,14 @@ protected: void showDropDownMenu(); - LLHandle<LLView> mPopupMenuHandle; - LLHandle<LLView> mInventoryItemsPopupMenuHandle; + LLHandle<LLView> mOverflowMenuHandle; + LLHandle<LLView> mContextMenuHandle; LLUUID mFavoriteFolderId; const LLFontGL *mFont; S32 mFirstDropDownItem; bool mUpdateDropDownItems; + bool mRestoreOverflowMenu; LLUUID mSelectedItemID; |