#2923 Add 'Create Landmark' button to the agent profile floater

Author: LLGuru

indra/newview/lllandmarkactions.cpp

@@ -277,12 +277,21 @@ void LLLandmarkActions::showFloaterCreateLandmarkForUrl(const std::string& url,
         return;
     }
 
+    S32 x = (S32)std::round(slurl.getPosition()[VX]);
+    S32 y = (S32)std::round(slurl.getPosition()[VY]);
+    S32 z = (S32)std::round(slurl.getPosition()[VZ]);
+    // When title == url we provide an empty string to create a human-readable title
+    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)
+{
     LLSD data;
-    data["region"] = slurl.getRegion();
-    data["x"] = (S32)std::round(slurl.getPosition()[VX]);
-    data["y"] = (S32)std::round(slurl.getPosition()[VY]);
-    data["z"] = (S32)std::round(slurl.getPosition()[VZ]);
-    data["title"] = title.empty() ? slurl.getRegion() : title;
+    data["region"] = region_name;
+    data["x"] = x;
+    data["y"] = y;
+    data["z"] = z;
+    data["title"] = title.empty() ? llformat("%s (%d, %d, %d)", region_name.c_str(), x, y, z) : title;
 
     LLFloaterReg::showInstance("add_landmark", data);
 }

indra/newview/lllandmarkactions.h

@@ -90,6 +90,12 @@ class LLLandmarkActions
      */
     static void showFloaterCreateLandmarkForUrl(const std::string& url, const std::string& title);
 
+    /**
+     * @brief Shows floater to create landmark for specified coordinates.
+     */
+    static void showFloaterCreateLandmarkForCoords(const std::string& region_name, S32 x, S32 y, S32 z,
+        const std::string& title = LLStringUtil::null);
+
     /**
      * @brief Checks possibility to create landmark for specified URL.
      */

indra/newview/llpanelprofilepicks.cpp

@@ -36,11 +36,13 @@
 #include "lldispatcher.h"
 #include "llfloaterreg.h"
 #include "llfloaterworldmap.h"
+#include "lllandmarkactions.h"
 #include "lllineeditor.h"
 #include "llnotificationsutil.h"
 #include "llpanelavatar.h"
 #include "llpanelprofile.h"
 #include "llparcel.h"
+#include "llregionhandle.h"
 #include "llstartup.h"
 #include "lltabcontainer.h"
 #include "lltextbox.h"
@@ -51,6 +53,7 @@
 #include "llviewergenericmessage.h" // send_generic_message
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
+#include "llworldmap.h"
 
 static LLPanelInjector<LLPanelProfilePicks> t_panel_profile_picks("panel_profile_picks");
 static LLPanelInjector<LLPanelProfilePick> t_panel_profile_pick("panel_profile_pick");
@@ -589,26 +592,28 @@ bool LLPanelProfilePick::postBuild()
     mSaveButton = getChild<LLButton>("save_changes_btn");
     mCreateButton = getChild<LLButton>("create_changes_btn");
     mCancelButton = getChild<LLButton>("cancel_changes_btn");
+    mCreateLandmarkButton = getChild<LLButton>("create_landmark_btn");
     mSetCurrentLocationButton = getChild<LLButton>("set_to_curr_location_btn");
 
     mSnapshotCtrl = getChild<LLTextureCtrl>("pick_snapshot");
-    mSnapshotCtrl->setCommitCallback(boost::bind(&LLPanelProfilePick::onSnapshotChanged, this));
+    mSnapshotCtrl->setCommitCallback([&](LLUICtrl*, const LLSD&) { onSnapshotChanged(); });
     mSnapshotCtrl->setAllowLocalTexture(false);
     mSnapshotCtrl->setBakeTextureEnabled(false);
 
-    childSetAction("teleport_btn", boost::bind(&LLPanelProfilePick::onClickTeleport, this));
-    childSetAction("show_on_map_btn", boost::bind(&LLPanelProfilePick::onClickMap, this));
+    childSetAction("teleport_btn", [&](LLUICtrl*, const LLSD&) { onClickTeleport(); });
+    childSetAction("show_on_map_btn", [&](LLUICtrl*, const LLSD&) { onClickMap(); });
 
-    mSaveButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickSave, this));
-    mCreateButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickSave, this));
-    mCancelButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickCancel, this));
-    mSetCurrentLocationButton->setCommitCallback(boost::bind(&LLPanelProfilePick::onClickSetLocation, this));
+    mSaveButton->setCommitCallback([&](LLUICtrl*, const LLSD&) { onClickSave(); });
+    mCreateButton->setCommitCallback([&](LLUICtrl*, const LLSD&) { onClickSave(); });
+    mCancelButton->setCommitCallback([&](LLUICtrl*, const LLSD&) { onClickCancel(); });
+    mCreateLandmarkButton->setCommitCallback([&](LLUICtrl*, const LLSD&) { onClickCreateLandmark(); });
+    mSetCurrentLocationButton->setCommitCallback([&](LLUICtrl*, const LLSD&) { onClickSetLocation(); });
 
-    mPickName->setKeystrokeCallback(boost::bind(&LLPanelProfilePick::onPickChanged, this, _1), NULL);
+    mPickName->setKeystrokeCallback([&](LLLineEditor* ctrl, void*) { onPickChanged(ctrl); }, NULL);
     mPickName->setEnabled(false);
 
-    mPickDescription->setKeystrokeCallback(boost::bind(&LLPanelProfilePick::onPickChanged, this, _1));
-    mPickDescription->setFocusReceivedCallback(boost::bind(&LLPanelProfilePick::onDescriptionFocusReceived, this));
+    mPickDescription->setKeystrokeCallback([&](LLTextEditor* ctrl) { onPickChanged(ctrl); });
+    mPickDescription->setFocusReceivedCallback([&](LLFocusableElement*) { onDescriptionFocusReceived(); });
 
     getChild<LLUICtrl>("pick_location")->setEnabled(false);
 
@@ -765,6 +770,27 @@ bool LLPanelProfilePick::isDirty() const
     return false;
 }
 
+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");
+}
+
 void LLPanelProfilePick::onClickSetLocation()
 {
     // Save location for later use.
@@ -899,14 +925,14 @@ void LLPanelProfilePick::sendUpdate()
 std::string LLPanelProfilePick::createLocationText(const std::string& owner_name, const std::string& original_name, const std::string& sim_name, const LLVector3d& pos_global)
 {
     std::string location_text(owner_name);
+
     if (!original_name.empty())
     {
         if (!location_text.empty())
         {
             location_text.append(", ");
         }
         location_text.append(original_name);
-
     }
 
     if (!sim_name.empty())
@@ -918,18 +944,18 @@ std::string LLPanelProfilePick::createLocationText(const std::string& owner_name
         location_text.append(sim_name);
     }
 
-    if (!location_text.empty())
-    {
-        location_text.append(" ");
-    }
-
     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));
+        location_text.append(llformat("(%d, %d, %d)", region_x, region_y, region_z));
     }
+
     return location_text;
 }
 

indra/newview/llpanelprofilepicks.h

@@ -201,6 +201,11 @@ class LLPanelProfilePick
      */
     void resetDirty() override;
 
+    /**
+     * Callback for "CreateLandmark" button click
+     */
+    void onClickCreateLandmark();
+
     /**
      * Callback for "Set Location" button click
      */
@@ -228,6 +233,7 @@ class LLPanelProfilePick
     LLTextureCtrl*      mSnapshotCtrl;
     LLLineEditor*       mPickName;
     LLTextEditor*       mPickDescription;
+    LLButton*           mCreateLandmarkButton;
     LLButton*           mSetCurrentLocationButton;
     LLButton*           mSaveButton;
     LLButton*           mCreateButton;

indra/newview/skins/default/xui/en/panel_profile_pick.xml

@@ -160,6 +160,25 @@
          width="1">
         </layout_panel>
 
+        <layout_panel
+         follows="all"
+         layout="bottomleft"
+         left_pad="2"
+         name="tp_btn_lp"
+         auto_resize="false"
+         width="80">
+          <button
+           name="teleport_btn"
+           label="Teleport"
+           left="0"
+           top="0"
+           height="23"
+           width="80"
+           follows="left|top"
+           layout="topleft"
+          />
+        </layout_panel>
+
         <layout_panel
          follows="all"
          layout="bottomleft"
@@ -176,23 +195,23 @@
            width="100"
            follows="left|top"
            layout="topleft"
-      />
+          />
         </layout_panel>
 
         <layout_panel
          follows="all"
          layout="bottomleft"
          left_pad="2"
-         name="tp_btn_lp"
+         name="cl_btn_lp"
          auto_resize="false"
-         width="100">
+         width="120">
           <button
-           name="teleport_btn"
-           label="Teleport"
+           name="create_landmark_btn"
+           label="Create Landmark"
            left="0"
            top="0"
            height="23"
-           width="100"
+           width="120"
            follows="left|top"
            layout="topleft"
           />