diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2026-02-10 14:59:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-10 14:59:36 -0500 |
| commit | e7cc46743b0a032a3091b3ea6922a4af07e5172a (patch) | |
| tree | a7ec6a161693d5685c6a30b602b4c3c02752153b /indra/newview/llinventorygallerymenu.cpp | |
| parent | 53fb215df1101e690d6b03600cb52eeaf38a9c26 (diff) | |
| parent | b4a6af57a667d355e7347f1a3c13173b44b361ff (diff) | |
Merge pull request #5402 from secondlife/release/2026.01
26.01 -> 26.02
Diffstat (limited to 'indra/newview/llinventorygallerymenu.cpp')
| -rw-r--r-- | indra/newview/llinventorygallerymenu.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp index 1c1bb35723..1fe2965784 100644 --- a/indra/newview/llinventorygallerymenu.cpp +++ b/indra/newview/llinventorygallerymenu.cpp @@ -338,14 +338,21 @@ void LLInventoryGalleryContextMenu::doToSelected(const LLSD& userdata) { LLVector3d global_pos; landmark->getGlobalPos(global_pos); - boost::function<void(std::string& slurl)> copy_slurl_to_clipboard_cb = [](const std::string& slurl) + if (!global_pos.isExactlyZero()) { - gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(slurl)); - LLSD args; - args["SLURL"] = slurl; - LLNotificationsUtil::add("CopySLURL", args); - }; - LLLandmarkActions::getSLURLfromPosGlobal(global_pos, copy_slurl_to_clipboard_cb, true); + boost::function<void(std::string& slurl)> copy_slurl_to_clipboard_cb = [](const std::string& slurl) + { + gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(slurl)); + LLSD args; + args["SLURL"] = slurl; + LLNotificationsUtil::add("CopySLURL", args); + }; + LLLandmarkActions::getSLURLfromPosGlobal(global_pos, copy_slurl_to_clipboard_cb, true); + } + else + { + LLNotificationsUtil::add("LandmarkLocationUnknown"); + } }; LLLandmark* landmark = LLLandmarkActions::getLandmark(mUUIDs.front(), copy_slurl_cb); if (landmark) |
