diff options
author | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2014-05-20 10:03:09 -0700 |
commit | 0481494c2df074d2b548d6b80e595a208a2848c3 (patch) | |
tree | f3554fc49b549a4ae2b9d1e9a5f157e478ee38df /indra/newview/llplacesfolderview.h | |
parent | 4c7b0cb528f61bc20866c2f7c43049ef7bc49bf2 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with 3.7.8-release
Diffstat (limited to 'indra/newview/llplacesfolderview.h')
-rwxr-xr-x | indra/newview/llplacesfolderview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llplacesfolderview.h b/indra/newview/llplacesfolderview.h index 8c5be39b5e..65fe76007a 100755 --- a/indra/newview/llplacesfolderview.h +++ b/indra/newview/llplacesfolderview.h @@ -51,6 +51,8 @@ public: */ /*virtual*/ BOOL handleRightMouseDown( S32 x, S32 y, MASK mask ); + /*virtual*/ void updateMenu(); + void setupMenuHandle(LLInventoryType::EType asset_type, LLHandle<LLView> menu_handle); void setParentLandmarksPanel(LLLandmarksPanel* panel) |