Skip to content
Snippets Groups Projects
Commit ce15e096 authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Use std::function to see if it fixes warning

parent b01f2222
No related branches found
No related tags found
No related merge requests found
......@@ -239,11 +239,11 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata)
}
else if ("copy_slurl" == action)
{
boost::function<void(LLLandmark*)> copy_slurl_cb = [](LLLandmark* landmark)
std::function<void(LLLandmark*)> copy_slurl_cb = [](LLLandmark* landmark)
{
LLVector3d global_pos;
landmark->getGlobalPos(global_pos);
boost::function<void(std::string& slurl)> copy_slurl_to_clipboard_cb = [](std::string& slurl)
std::function<void(std::string& slurl)> copy_slurl_to_clipboard_cb = [](std::string& slurl)
{
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(slurl));
LLSD args;
......
......@@ -39,8 +39,8 @@ class LLLandmark;
class LLLandmarkActions
{
public:
typedef boost::function<void(std::string& slurl)> slurl_callback_t;
typedef boost::function<void(std::string& slurl, S32 x, S32 y, S32 z)> region_name_and_coords_callback_t;
typedef std::function<void(std::string& slurl)> slurl_callback_t;
typedef std::function<void(std::string& slurl, S32 x, S32 y, S32 z)> region_name_and_coords_callback_t;
/**
* @brief Fetches landmark LLViewerInventoryItems for the given landmark name.
......
......@@ -38,7 +38,7 @@ class LLWorldMapMessage final : public LLSingleton<LLWorldMapMessage>
~LLWorldMapMessage();
public:
typedef boost::function<void(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>
typedef std::function<void(U64 region_handle, const std::string& url, const LLUUID& snapshot_id, bool teleport)>
url_callback_t;
// Process incoming answers to map stuff requests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment