diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2017-12-21 13:53:08 +0000 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2017-12-21 13:53:08 +0000 |
| commit | 3cf566a115e71e4d9511afc4b76b12afdfc33934 (patch) | |
| tree | 6aa59f9e04cde7fe57336ff5c30cdca66465b82e /indra | |
| parent | 2897ea5c5b997ce19b9b7687a5bbc428c523c6ab (diff) | |
| parent | dedaabe9ec74cdeb3d1ecc83fcd597696116d524 (diff) | |
MAINT-1251 Fixed Search Error when Double Clicking on Sales Tags in WorldMap
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatersearch.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatersearch.cpp b/indra/newview/llfloatersearch.cpp index a446b767ac..66e832111b 100644 --- a/indra/newview/llfloatersearch.cpp +++ b/indra/newview/llfloatersearch.cpp @@ -100,6 +100,7 @@ LLFloaterSearch::LLFloaterSearch(const Params& key) : mCategoryPaths["events"] = "search/events"; mCategoryPaths["groups"] = "search/groups"; mCategoryPaths["wiki"] = "search/wiki"; + mCategoryPaths["land"] = "land"; mCategoryPaths["destinations"] = "destinations"; mCategoryPaths["classifieds"] = "classifieds"; } 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: |