#2924 Add 'Create Landmark' to the place context menu

LLGuru · LLGuru · commit 023fa2d8ac6a · 2024-12-07T00:12:21.000+01:00
diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp
@@ -26,6 +26,7 @@
 
 #include "linden_common.h"      // Modifies curl/curl.h interfaces
 #include "httpcommon.h"
+#include "llhttpconstants.h"
 #include "llmutex.h"
 #include "llthread.h"
 #include <curl/curl.h>
@@ -79,47 +80,47 @@ std::string HttpStatus::toString() const
 
     static const std::map<type_enum_t, std::string> http_errors =
         {
-            { 100, "Continue" },
-            { 101, "Switching Protocols" },
-            { 200, "OK" },
-            { 201, "Created" },
-            { 202, "Accepted" },
-            { 203, "Non-Authoritative Information" },
-            { 204, "No Content" },
-            { 205, "Reset Content" },
-            { 206, "Partial Content" },
-            { 300, "Multiple Choices" },
-            { 301, "Moved Permanently" },
-            { 302, "Found" },
-            { 303, "See Other" },
-            { 304, "Not Modified" },
-            { 305, "Use Proxy" },
-            { 307, "Temporary Redirect" },
-            { 400, "Bad Request" },
-            { 401, "Unauthorized" },
-            { 402, "Payment Required" },
-            { 403, "Forbidden" },
-            { 404, "Not Found" },
-            { 405, "Method Not Allowed" },
-            { 406, "Not Acceptable" },
-            { 407, "Proxy Authentication Required" },
-            { 408, "Request Time-out" },
-            { 409, "Conflict" },
-            { 410, "Gone" },
-            { 411, "Length Required" },
-            { 412, "Precondition Failed" },
-            { 413, "Request Entity Too Large" },
-            { 414, "Request-URI Too Large" },
-            { 415, "Unsupported Media Type" },
-            { 416, "Requested range not satisfiable" },
-            { 417, "Expectation Failed" },
-            { 499, "Linden Catch-All" },
-            { 500, "Internal Server Error" },
-            { 501, "Not Implemented" },
-            { 502, "Bad Gateway" },
-            { 503, "Service Unavailable" },
-            { 504, "Gateway Time-out" },
-            { 505, "HTTP Version not supported" }
+            { HTTP_CONTINUE,                        "Continue" },
+            { HTTP_SWITCHING_PROTOCOLS,             "Switching Protocols" },
+            { HTTP_OK,                              "OK" },
+            { HTTP_CREATED,                         "Created" },
+            { HTTP_ACCEPTED,                        "Accepted" },
+            { HTTP_NON_AUTHORITATIVE_INFORMATION,   "Non-Authoritative Information" },
+            { HTTP_NO_CONTENT,                      "No Content" },
+            { HTTP_RESET_CONTENT,                   "Reset Content" },
+            { HTTP_PARTIAL_CONTENT,                 "Partial Content" },
+            { HTTP_MULTIPLE_CHOICES,                "Multiple Choices" },
+            { HTTP_MOVED_PERMANENTLY,               "Moved Permanently" },
+            { HTTP_FOUND,                           "Found" },
+            { HTTP_SEE_OTHER,                       "See Other" },
+            { HTTP_NOT_MODIFIED,                    "Not Modified" },
+            { HTTP_USE_PROXY,                       "Use Proxy" },
+            { HTTP_TEMPORARY_REDIRECT,              "Temporary Redirect" },
+            { HTTP_BAD_REQUEST,                     "Bad Request" },
+            { HTTP_UNAUTHORIZED,                    "Unauthorized" },
+            { HTTP_PAYMENT_REQUIRED,                "Payment Required" },
+            { HTTP_FORBIDDEN,                       "Forbidden" },
+            { HTTP_NOT_FOUND,                       "Not Found" },
+            { HTTP_METHOD_NOT_ALLOWED,              "Method Not Allowed" },
+            { HTTP_NOT_ACCEPTABLE,                  "Not Acceptable" },
+            { HTTP_PROXY_AUTHENTICATION_REQUIRED,   "Proxy Authentication Required" },
+            { HTTP_REQUEST_TIME_OUT,                "Request Time-out" },
+            { HTTP_CONFLICT,                        "Conflict" },
+            { HTTP_GONE,                            "Gone" },
+            { HTTP_LENGTH_REQUIRED,                 "Length Required" },
+            { HTTP_PRECONDITION_FAILED,             "Precondition Failed" },
+            { HTTP_REQUEST_ENTITY_TOO_LARGE,        "Request Entity Too Large" },
+            { HTTP_REQUEST_URI_TOO_LARGE,           "Request-URI Too Large" },
+            { HTTP_UNSUPPORTED_MEDIA_TYPE,          "Unsupported Media Type" },
+            { HTTP_REQUESTED_RANGE_NOT_SATISFIABLE, "Requested range not satisfiable" },
+            { HTTP_EXPECTATION_FAILED,              "Expectation Failed" },
+            { 499,                                  "Linden Catch-All" },
+            { HTTP_INTERNAL_SERVER_ERROR,           "Internal Server Error" },
+            { HTTP_NOT_IMPLEMENTED,                 "Not Implemented" },
+            { HTTP_BAD_GATEWAY,                     "Bad Gateway" },
+            { HTTP_SERVICE_UNAVAILABLE,             "Service Unavailable" },
+            { HTTP_GATEWAY_TIME_OUT,                "Gateway Time-out" },
+            { HTTP_VERSION_NOT_SUPPORTED,           "HTTP Version not supported" }
         };
 
     if (*this)
diff --git a/indra/newview/lllandmarkactions.cpp b/indra/newview/lllandmarkactions.cpp
@@ -274,6 +274,7 @@ void LLLandmarkActions::showFloaterCreateLandmarkForUrl(const std::string& url,
         (slurl.getType() != LLSLURL::APP || slurl.getAppCmd() != LLSLURL::SLURL_REGION_PATH))
     {
         LL_INFOS() << "Unsupported URL: '" << url << "'" << LL_ENDL;
+        LLNotificationsUtil::add("CantCreateLandmark");
         return;
     }
 
@@ -284,7 +285,29 @@ void LLLandmarkActions::showFloaterCreateLandmarkForUrl(const std::string& url,
     showFloaterCreateLandmarkForCoords(slurl.getRegion(), x, y, z, title == url ? LLStringUtil::null : title);
 }
 
-void LLLandmarkActions::showFloaterCreateLandmarkForCoords(const std::string& region_name, S32 x, S32 y, S32 z, const std::string& title)
+void LLLandmarkActions::showFloaterCreateLandmarkForPos(const LLVector3d& global_pos, const std::string& title)
+{
+    if (LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromPosGlobal(global_pos))
+    {
+        std::string region_name = info->getName();
+        LLVector3 local_pos = info->getLocalPos(global_pos);
+        S32 x = ll_round(local_pos.mV[VX]);
+        S32 y = ll_round(local_pos.mV[VY]);
+        S32 z = ll_round(local_pos.mV[VZ]);
+        showFloaterCreateLandmarkForCoords(region_name, x, y, z, title);
+        return;
+    }
+
+    LL_WARNS() << "No region found for global pos " << global_pos << LL_ENDL;
+    LLNotificationsUtil::add("CantCreateLandmarkTryAgain");
+
+    S32 x = S32(global_pos.mdV[0] / REGION_WIDTH_UNITS);
+    S32 y = S32(global_pos.mdV[1] / REGION_WIDTH_UNITS);
+    LLWorldMapMessage::getInstance()->sendMapBlockRequest(x, y, x, y, true);
+}
+
+void LLLandmarkActions::showFloaterCreateLandmarkForCoords(const std::string& region_name,
+    S32 x, S32 y, S32 z, const std::string& title)
 {
     LLSD data;
     data["region"] = region_name;
diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
@@ -91,7 +91,13 @@ class LLLandmarkActions
     static void showFloaterCreateLandmarkForUrl(const std::string& url, const std::string& title);
 
     /**
-     * @brief Shows floater to create landmark for specified coordinates.
+     * @brief Shows floater to create landmark for specified global position.
+     */
+    static void showFloaterCreateLandmarkForPos(const LLVector3d& global_pos,
+        const std::string& title = LLStringUtil::null);
+
+    /**
+     * @brief Shows floater to create landmark for specified region coordinates.
      */
     static void showFloaterCreateLandmarkForCoords(const std::string& region_name, S32 x, S32 y, S32 z,
         const std::string& title = LLStringUtil::null);
diff --git a/indra/newview/llpanelprofilepicks.cpp b/indra/newview/llpanelprofilepicks.cpp
@@ -772,23 +772,8 @@ bool LLPanelProfilePick::isDirty() const
 
 void LLPanelProfilePick::onClickCreateLandmark()
 {
-    if (gAgent.getRegion() &&
-        !gAgent.getRegion()->getCapability("CreateLandmarkForPosition").empty())
-    {
-        U64 handle = to_region_handle(mPosGlobal);
-        if (LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromHandle(handle))
-        {
-            std::string region_name = info->getName();
-            S32 x = llclamp(ll_round((F32)mPosGlobal.mdV[VX]), 0, REGION_WIDTH_UNITS);
-            S32 y = llclamp(ll_round((F32)mPosGlobal.mdV[VY]), 0, REGION_WIDTH_UNITS);
-            S32 z = ll_round(llclamp((F32)mPosGlobal.mdV[VZ], MIN_OBJECT_Z, MAX_OBJECT_Z));
-            std::string title = getChild<LLUICtrl>("pick_location")->getValue().asString();
-            LLLandmarkActions::showFloaterCreateLandmarkForCoords(region_name, x, y, z, title);
-            return;
-        }
-    }
-
-    LLNotificationsUtil::add("CantCreateLandmark");
+    std::string title = getChild<LLUICtrl>("pick_location")->getValue().asString();
+    LLLandmarkActions::showFloaterCreateLandmarkForPos(mPosGlobal, title);
 }
 
 void LLPanelProfilePick::onClickSetLocation()
@@ -926,34 +911,27 @@ std::string LLPanelProfilePick::createLocationText(const std::string& owner_name
 {
     std::string location_text(owner_name);
 
-    if (!original_name.empty())
-    {
-        if (!location_text.empty())
+    auto append = [&](const std::string& text, const std::string& delimiter)
         {
-            location_text.append(", ");
-        }
-        location_text.append(original_name);
-    }
+            if (!text.empty())
+            {
+                if (!location_text.empty())
+                {
+                    location_text.append(delimiter);
+                }
+                location_text.append(text);
+            }
+        };
 
-    if (!sim_name.empty())
-    {
-        if (!location_text.empty())
-        {
-            location_text.append(", ");
-        }
-        location_text.append(sim_name);
-    }
+    append(original_name, ", ");
+    append(sim_name, ", ");
 
     if (!pos_global.isNull())
     {
-        if (!location_text.empty())
-        {
-            location_text.append(" ");
-        }
         S32 region_x = ll_round((F32)pos_global.mdV[VX]) % REGION_WIDTH_UNITS;
         S32 region_y = ll_round((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
         S32 region_z = ll_round((F32)pos_global.mdV[VZ]);
-        location_text.append(llformat("(%d, %d, %d)", region_x, region_y, region_z));
+        append(llformat("(%d, %d, %d)", region_x, region_y, region_z), " ");
     }
 
     return location_text;
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp
@@ -29,6 +29,7 @@
 #include "llfloaterreg.h"
 #include "llmenubutton.h"
 
+#include "llagent.h"
 #include "llfloaterworldmap.h"
 #include "llpanelteleporthistory.h"
 #include "llworldmap.h"
@@ -413,8 +414,8 @@ LLTeleportHistoryPanel::~LLTeleportHistoryPanel()
 
 bool LLTeleportHistoryPanel::postBuild()
 {
-    mCommitCallbackRegistrar.add("TeleportHistory.GearMenu.Action", { boost::bind(&LLTeleportHistoryPanel::onGearMenuAction, this, _2), cb_info::UNTRUSTED_THROTTLE });
-    mEnableCallbackRegistrar.add("TeleportHistory.GearMenu.Enable", boost::bind(&LLTeleportHistoryPanel::isActionEnabled, this, _2));
+    mCommitCallbackRegistrar.add("TeleportHistory.GearMenu.Action", { [&](LLUICtrl* ctrl, const LLSD& param) { onGearMenuAction(param); }, cb_info::UNTRUSTED_THROTTLE });
+    mEnableCallbackRegistrar.add("TeleportHistory.GearMenu.Enable", [&](LLUICtrl* ctrl, const LLSD& param) { return isActionEnabled(param); });
 
     // init menus before list, since menus are passed to list
     mGearItemMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_teleport_history_item.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
@@ -1063,6 +1064,10 @@ void LLTeleportHistoryPanel::onGearMenuAction(const LLSD& userdata)
     {
         confirmTeleport(index);
     }
+    else if ("landmark" == command_name)
+    {
+        createLandmark(index);
+    }
     else if ("view" == command_name)
     {
         LLTeleportHistoryFlatItem::showPlaceInfoPanel(index);
@@ -1135,6 +1140,7 @@ bool LLTeleportHistoryPanel::isActionEnabled(const LLSD& userdata) const
     }
 
     if ("teleport" == command_name
+        || "landmark" == command_name
         || "view" == command_name
         || "show_on_map" == command_name
         || "copy_slurl" == command_name
@@ -1188,7 +1194,17 @@ void LLTeleportHistoryPanel::confirmTeleport(S32 hist_idx)
     LLSD args;
     args["HISTORY_ENTRY"] = LLTeleportHistoryStorage::getInstance()->getItems()[hist_idx].mTitle;
     LLNotificationsUtil::add("TeleportToHistoryEntry", args, LLSD(),
-        boost::bind(&LLTeleportHistoryPanel::onTeleportConfirmation, _1, _2, hist_idx));
+        [&](const LLSD& notification, const LLSD& response)
+        {
+            onTeleportConfirmation(notification, response, hist_idx);
+        });
+}
+
+// static
+void LLTeleportHistoryPanel::createLandmark(S32 hist_idx)
+{
+    const LLTeleportHistoryPersistentItem& item = LLTeleportHistoryStorage::getInstance()->getItems()[hist_idx];
+    LLLandmarkActions::showFloaterCreateLandmarkForPos(item.mGlobalPos, item.mTitle);
 }
 
 // Called when user reacts upon teleport confirmation dialog.
diff --git a/indra/newview/llpanelteleporthistory.h b/indra/newview/llpanelteleporthistory.h
@@ -92,6 +92,7 @@ class LLTeleportHistoryPanel : public LLPanelPlacesTab
     void onAccordionExpand(LLUICtrl* ctrl, const LLSD& param);
 
     static void confirmTeleport(S32 hist_idx);
+    static void createLandmark(S32 hist_idx);
     static bool onTeleportConfirmation(const LLSD& notification, const LLSD& response, S32 hist_idx);
 
     LLTeleportHistoryStorage*   mTeleportHistory;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
@@ -1239,14 +1239,16 @@ void create_inventory_landmark(const LLUUID& folder_id, const std::string& name,
     LLViewerRegion* viewer_region = gAgent.getRegion();
     if (!viewer_region)
     {
-        LL_WARNS() << "No agent region" << LL_ENDL;
+        LL_WARNS("CreateLandmark") << "No agent region" << LL_ENDL;
+        LLNotificationsUtil::add("CantCreateLandmark");
         return;
     }
 
     std::string cap = viewer_region->getCapability("CreateLandmarkForPosition");
     if (cap.empty())
     {
-        LL_WARNS() << "Cap is not supported by the region '" << viewer_region->getName() << "'" << LL_ENDL;
+        LL_WARNS("CreateLandmark") << "Cap is not supported by the region '" << viewer_region->getName() << "'" << LL_ENDL;
+        LLNotificationsUtil::add("CantCreateLandmark");
         return;
     }
 
@@ -1276,12 +1278,12 @@ void create_inventory_landmark(const LLUUID& folder_id, const std::string& name,
 
             if (!status)
             {
-                LL_WARNS() << "Error " << status.getType() << ": '" << status.toString() << "'" << LL_ENDL;
-                LLNotificationsUtil::add("CantCreateLandmark");
+                LL_WARNS("CreateLandmark") << "Error " << status.getType() << ": '" << status.toString() << "'" << LL_ENDL;
+                LLNotificationsUtil::add(status.getType() == HTTP_PRECONDITION_FAILED ? "CantCreateLandmarkTryAgain" : "CantCreateLandmark");
             }
             else if (result.has("item_id"))
             {
-                LL_INFOS() << "Created item id: '" << result["item_id"] << "'" << LL_ENDL;
+                LL_INFOS("CreateLandmark") << "Created item id: '" << result["item_id"] << "'" << LL_ENDL;
             }
         });
 }
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -16,6 +16,17 @@
          function="TeleportHistory.GearMenu.Enable"
          parameter="teleport" />
     </menu_item_call>
+    <menu_item_call
+     label="Create Landmark"
+     layout="topleft"
+     name="create_landmark">
+        <on_click
+         function="TeleportHistory.GearMenu.Action"
+         parameter="landmark" />
+        <on_enable
+         function="TeleportHistory.GearMenu.Enable"
+         parameter="landmark" />
+    </menu_item_call>
     <menu_item_call
      label="View"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
@@ -11984,12 +11984,22 @@ Cannot create that inventory.
 Cannot create landmark.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CantCreateLandmarkTryAgain"
+   type="notify">
+   <tag>fail</tag>
+Cannot create landmark right now.
+Try again in a few seconds.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CantCreateOutfit"
    type="notify">
    <tag>fail</tag>
-Cannot create outfit right now. Try again in a minute.
+Cannot create outfit right now.
+Try again in a minute.
   </notification>
 
   <notification

Original file line number	Diff line number	Diff line change
`@@ -1239,14 +1239,16 @@ void create_inventory_landmark(const LLUUID& folder_id, const std::string& name,`
`1239`	`1239`	`LLViewerRegion* viewer_region = gAgent.getRegion();`
`1240`	`1240`	`if (!viewer_region)`
`1241`	`1241`	`{`
`1242`		`- LL_WARNS() << "No agent region" << LL_ENDL;`
	`1242`	`+ LL_WARNS("CreateLandmark") << "No agent region" << LL_ENDL;`
	`1243`	`+ LLNotificationsUtil::add("CantCreateLandmark");`
`1243`	`1244`	`return;`
`1244`	`1245`	`}`
`1245`	`1246`
`1246`	`1247`	`std::string cap = viewer_region->getCapability("CreateLandmarkForPosition");`
`1247`	`1248`	`if (cap.empty())`
`1248`	`1249`	`{`
`1249`		`- LL_WARNS() << "Cap is not supported by the region '" << viewer_region->getName() << "'" << LL_ENDL;`
	`1250`	`+ LL_WARNS("CreateLandmark") << "Cap is not supported by the region '" << viewer_region->getName() << "'" << LL_ENDL;`
	`1251`	`+ LLNotificationsUtil::add("CantCreateLandmark");`
`1250`	`1252`	`return;`
`1251`	`1253`	`}`
`1252`	`1254`
`@@ -1276,12 +1278,12 @@ void create_inventory_landmark(const LLUUID& folder_id, const std::string& name,`
`1276`	`1278`
`1277`	`1279`	`if (!status)`
`1278`	`1280`	`{`
`1279`		`- LL_WARNS() << "Error " << status.getType() << ": '" << status.toString() << "'" << LL_ENDL;`
`1280`		`- LLNotificationsUtil::add("CantCreateLandmark");`
	`1281`	`+ LL_WARNS("CreateLandmark") << "Error " << status.getType() << ": '" << status.toString() << "'" << LL_ENDL;`
	`1282`	`+ LLNotificationsUtil::add(status.getType() == HTTP_PRECONDITION_FAILED ? "CantCreateLandmarkTryAgain" : "CantCreateLandmark");`
`1281`	`1283`	`}`
`1282`	`1284`	`else if (result.has("item_id"))`
`1283`	`1285`	`{`
`1284`		`- LL_INFOS() << "Created item id: '" << result["item_id"] << "'" << LL_ENDL;`
	`1286`	`+ LL_INFOS("CreateLandmark") << "Created item id: '" << result["item_id"] << "'" << LL_ENDL;`
`1285`	`1287`	`}`
`1286`	`1288`	`});`
`1287`	`1289`	`}`