mirror of
https://github.com/FirestormViewer/phoenix-firestorm.git
synced 2026-08-14 08:53:53 +00:00
Merge branch 'main' of https://github.com/secondlife/viewer
# Conflicts: # indra/newview/llworldmapmessage.cpp
This commit is contained in:
@@ -18155,7 +18155,7 @@ Change of this parameter will affect the layout of buttons in notification toast
|
||||
<key>Type</key>
|
||||
<string>S32</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>WaterEditPresets</key>
|
||||
<map>
|
||||
|
||||
@@ -553,6 +553,11 @@ void LLLandmarkActions::copySLURLtoClipboard(const LLUUID& landmarkInventoryItem
|
||||
|
||||
void copy_slurl_to_clipboard_callback(const std::string& slurl)
|
||||
{
|
||||
if (slurl.empty())
|
||||
{
|
||||
LLNotificationsUtil::add("LandmarkLocationUnknown");
|
||||
return;
|
||||
}
|
||||
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(slurl));
|
||||
LLSD args;
|
||||
args["SLURL"] = slurl;
|
||||
|
||||
Reference in New Issue
Block a user