diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-03 15:55:53 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-03 15:55:53 -0700 |
| commit | 81e719387983990fe0a2a197a6e09059219c119a (patch) | |
| tree | f9f8b1bcab20e99413311f758dac521a3093050b /indra/newview/llplacesinventorybridge.cpp | |
| parent | eaa1ce61b084f23746934e0a7b899242045d691b (diff) | |
| parent | 9637333708a84a73784248cb842df68e520a311a (diff) | |
merge
Diffstat (limited to 'indra/newview/llplacesinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llplacesinventorybridge.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llplacesinventorybridge.cpp b/indra/newview/llplacesinventorybridge.cpp index b3b4857727..83443687c9 100644 --- a/indra/newview/llplacesinventorybridge.cpp +++ b/indra/newview/llplacesinventorybridge.cpp @@ -38,6 +38,7 @@ #include "llfloaterinventory.h" // for LLInventoryPanel #include "llfolderview.h" // for FIRST_SELECTED_ITEM +#include "llinventorypanel.h" static const std::string LANDMARKS_INVENTORY_LIST_NAME("landmarks_list"); @@ -83,7 +84,7 @@ void LLPlacesLandmarkBridge::buildContextMenu(LLMenuGL& menu, U32 flags) // they should be synchronized with Places/My Landmarks/Gear menu. See EXT-1601 } - hideContextEntries(menu, items, disabled_items); + hide_context_entries(menu, items, disabled_items); } @@ -116,7 +117,7 @@ void LLPlacesFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) // repeat parent functionality sSelf = this; // necessary for "New Folder" functionality - hideContextEntries(menu, items, disabled_items); + hide_context_entries(menu, items, disabled_items); } } |