summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-21 01:37:28 +0300
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2021-04-21 18:27:18 +0300
commit0ed270a0569e205f837f84773f5e72ab3b46d01b (patch)
treef07a556599bc9c59cfe0b65d6be8145ff093bd61
parent297b81b03ad1e01339735e612dbf17f131019403 (diff)
SL-14842 Landmarks created by '+' menu always starting in favorites
-rw-r--r--indra/newview/llpanellandmarks.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llpanellandmarks.cpp b/indra/newview/llpanellandmarks.cpp
index 4b73412e60..769b060d93 100644
--- a/indra/newview/llpanellandmarks.cpp
+++ b/indra/newview/llpanellandmarks.cpp
@@ -499,6 +499,12 @@ void LLLandmarksPanel::onAddAction(const LLSD& userdata) const
{
args["dest_folder"] = view_model->getUUID();
}
+ if ("add_landmark_root" == command_name
+ && mCurrentSelectedList == mLandmarksInventoryPanel)
+ {
+ args["dest_folder"] = mLandmarksInventoryPanel->getRootFolderID();
+ }
+ // else will end up in favorites
LLFloaterReg::showInstance("add_landmark", args);
}
}