diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-11-12 17:08:45 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2018-11-12 17:08:45 +0000 |
| commit | d4e7d4a4982c22520a177894ab91394ce10c3af5 (patch) | |
| tree | fdd97dea17de6c01e1a9b075aa9e4c95033875e7 | |
| parent | 2d222309500a667cd8880172daa8f3d2088596b6 (diff) | |
| parent | 5356e8b81a4c79bd9725ba4e6409b1b76083f463 (diff) | |
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: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 9 |
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: |