Skip to content
Snippets Groups Projects
Commit d4e7d4a4 authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merged in maxim_productengine/viewer-neko_maint2 (pull request #707)


SL-10043 FIXED Viewer crashes when double-clicking 'For sale' parcel icon on World map in some cases

Approved-by: default avatarAndrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: default avatarAndrey Kleshchev <andreykproductengine@lindenlab.com>
parents 2d222309 5356e8b8
No related branches found
No related tags found
No related merge requests found
......@@ -1751,9 +1751,12 @@ BOOL LLWorldMapView::handleDoubleClick( S32 x, S32 y, MASK mask )
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", "land").with("query", info->getName()));
std::string sim_name;
if (LLWorldMap::getInstance()->simNameFromPosGlobal(pos_global, sim_name))
{
LLFloaterReg::hideInstance("world_map");
LLFloaterReg::showInstance("search", LLSD().with("category", "land").with("query", sim_name));
}
break;
}
case MAP_ITEM_CLASSIFIED:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment