diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-06-28 09:21:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-06-28 09:21:38 -0400 |
| commit | 2ee2f1d6ff4f0bde01899e2eaf0170608b657bf2 (patch) | |
| tree | 5ed2f028d39cd6ecc919d02148c52aaacca5ad78 | |
| parent | b24f9295a2e439314a34f9364f2804e51fae8b8d (diff) | |
| parent | 786da1eb383502a268f71938e16b525a72e01abe (diff) | |
merge changes for vwr-25480
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 19 |
2 files changed, 15 insertions, 6 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index dc5bf53c1c..256c39eb9e 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -158,6 +158,7 @@ Ann Congrejo CT-193 Ansariel Hiller STORM-1101 + VWR-25480 Ardy Lay STORM-859 VWR-19499 @@ -443,6 +444,7 @@ Jonathan Yap STORM-1236 STORM-1259 STORM-787 + VWR-25480 STORM-1334 STORM-1313 STORM-899 diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index f8a4ce7ad0..b3910982d1 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -1527,17 +1527,24 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim) 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<LLUICtrl>("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); } |