diff options
author | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
---|---|---|
committer | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
commit | f4867d032dfe93b249eb188f071cb309e3a7b23e (patch) | |
tree | 144bb92ed630302d1d68910069ad2505946eb471 /indra/newview/llworldmapview.cpp | |
parent | 278382abd72a02b5e190cb259d2b4806f3908902 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r-- | indra/newview/llworldmapview.cpp | 4 |
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: |