summaryrefslogtreecommitdiff
path: root/indra/newview/llworldmapview.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-04-12 15:22:25 -0700
committercallum_linden <none@none>2018-04-12 15:22:25 -0700
commit6c953d0bde107059db75d01cd30326a31cd0de54 (patch)
treec41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/newview/llworldmapview.cpp
parentbdd7bdf390775860fb26a6c7d0923f45bb20256c (diff)
parent41f4e854732a7c75a813b2e99285cc41bde13e5e (diff)
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r--indra/newview/llworldmapview.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 62fad32246..9ae788a409 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -1750,8 +1750,10 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
case MAP_ITEM_LAND_FOR_SALE:
case MAP_ITEM_LAND_FOR_SALE_ADULT:
{
+ LLVector3d pos_global = viewPosToGlobal(x, y);
+ LLSimInfo* info = LLWorldMap::getInstance()->simInfoFromPosGlobal(pos_global);
LLFloaterReg::hideInstance("world_map");
- LLFloaterReg::showInstance("search", LLSD().with("category", "destinations").with("query", id));
+ LLFloaterReg::showInstance("search", LLSD().with("category", "land").with("query", info->getName()));
break;
}
case MAP_ITEM_CLASSIFIED: