diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
commit | 854e6acb424faa843f9bff7875927fcfec2cb1d4 (patch) | |
tree | 5a5f21c59ba6eb1c6551bb37538f3125c2c4ccbb /indra/newview/llfolderview.h | |
parent | 547bcc907389aeb1a3d974025b621e98d1178714 (diff) | |
parent | afaa076b7dd300a2836205fe6eb9ba5ab08bfb28 (diff) |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/llfolderview.h')
-rw-r--r-- | indra/newview/llfolderview.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h index e3af29a4aa..6fa69e55a4 100644 --- a/indra/newview/llfolderview.h +++ b/indra/newview/llfolderview.h @@ -262,6 +262,7 @@ public: BOOL needsAutoSelect() { return mNeedsAutoSelect && !mAutoSelectOverride; } BOOL needsAutoRename() { return mNeedsAutoRename; } void setNeedsAutoRename(BOOL val) { mNeedsAutoRename = val; } + void setPinningSelectedItem(BOOL val) { mPinningSelectedItem = val; } void setCallbackRegistrar(LLUICtrl::CommitCallbackRegistry::ScopedRegistrar* registrar) { mCallbackRegistrar = registrar; } @@ -290,6 +291,8 @@ protected: bool selectFirstItem(); bool selectLastItem(); + BOOL addNoOptions(LLMenuGL* menu) const; + protected: LLHandle<LLView> mPopupMenuHandle; |