diff -r 6a3e7e403bd1 indra/newview/llfloaterworldmap.cpp --- a/indra/newview/llfloaterworldmap.cpp Thu Jun 09 16:27:11 2011 -0400 +++ b/indra/newview/llfloaterworldmap.cpp Sat Jun 11 18:54:46 2011 +0200 @@ -1527,17 +1527,24 @@ mCompletingRegionName = ""; } - // if match found, highlight it and go - if (!match.isUndefined()) + if (num_results > 0) { - list->selectByValue(match); + // if match found, highlight it and go + if (!match.isUndefined()) + { + list->selectByValue(match); + } + // else select first found item + else + { + list->selectFirstItem(); + } getChild("search_results")->setFocus(TRUE); onCommitSearchResult(); } - - // if we found nothing, say "none" - if (num_results == 0) + else { + // if we found nothing, say "none" list->setCommentText(LLTrans::getString("worldmap_results_none_found")); list->operateOnAll(LLCtrlListInterface::OP_DESELECT); }