diff options
| author | James Cook <james@lindenlab.com> | 2010-05-11 16:11:09 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-11 16:11:09 -0700 |
| commit | 2b7153c26a6dd5284218253910f466a0faeff708 (patch) | |
| tree | 8b8f54545c540d4e5f28d4a91215280117f52dff /indra/newview/llpanellandmarks.h | |
| parent | bae06b4b62587bd567495e3940a323e4c635a63e (diff) | |
| parent | 8e1dbbbb5628eee210a0a7c25f32287d7b754a8b (diff) | |
merge from dessie/viewer-public right before SLE code landed
Diffstat (limited to 'indra/newview/llpanellandmarks.h')
| -rw-r--r-- | indra/newview/llpanellandmarks.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h index c9217a4b2f..2d1eb0f091 100644 --- a/indra/newview/llpanellandmarks.h +++ b/indra/newview/llpanellandmarks.h @@ -57,6 +57,7 @@ public: /*virtual*/ BOOL postBuild(); /*virtual*/ void onSearchEdit(const std::string& string); /*virtual*/ void onShowOnMap(); + /*virtual*/ void onShowProfile(); /*virtual*/ void onTeleport(); /*virtual*/ void updateVerbs(); @@ -141,7 +142,7 @@ private: /** * Processes drag-n-drop of the Landmarks and folders into trash button. */ - bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, EAcceptance* accept); + bool handleDragAndDropToTrash(BOOL drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept); /** * Landmark actions callbacks. Fire when a landmark is loaded from the list. |