summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaxim_productengine <mnikolenko@productengine.com>2018-11-12 17:24:03 +0200
committermaxim_productengine <mnikolenko@productengine.com>2018-11-12 17:24:03 +0200
commit5356e8b81a4c79bd9725ba4e6409b1b76083f463 (patch)
tree1880552cb9e7ed7dd1cc537e75c532b3acc28ff1 /indra
parent93f60cfe1d9d6243768fd1f8f2fa7e11bf94793d (diff)
SL-10043 FIXED Viewer crashes when double-clicking 'For sale' parcel icon on World map in some cases
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llworldmapview.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 707fe76cef..b88631a71b 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -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: