diff options
| author | Callum Prentice <callum@mbp.local> | 2021-06-24 14:35:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.local> | 2021-06-24 14:35:24 -0700 |
| commit | 57da3e609fddb37ef3ddef830a0be84ebc5337bd (patch) | |
| tree | 070d74bad9a108d3c2610480cc32e7ba46c9b81d /indra/newview/lllocationinputctrl.cpp | |
| parent | 6baaef4ee20b62b310ea738e416feeb417ed1792 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 83195e9e3f..d6f3068610 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -44,6 +44,7 @@ // newview includes #include "llagent.h" +#include "llfloaterreg.h" #include "llfloatersidepanelcontainer.h" #include "llinventoryobserver.h" #include "lllandmarkactions.h" @@ -653,7 +654,7 @@ void LLLocationInputCtrl::onAddLandmarkButtonClicked() } else { - LLFloaterSidePanelContainer::showPanel("places", LLSD().with("type", "create_landmark")); + LLFloaterReg::showInstance("add_landmark"); } } @@ -1126,7 +1127,7 @@ void LLLocationInputCtrl::onLocationContextMenuItemClicked(const LLSD& userdata) if(!landmark) { - LLFloaterSidePanelContainer::showPanel("places", LLSD().with("type", "create_landmark")); + LLFloaterReg::showInstance("add_landmark"); } else { |