Merge branch 'develop' into gltf_mesh_import

1 files changed, 5 insertions, 4 deletions

diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index c70058145a..565642e683 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -1694,14 +1694,15 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
         if (!match.isUndefined())
         {
             mSearchResults->selectByValue(match);
+            mSearchResults->setFocus(true);
+            onCommitSearchResult();
         }
-        // else select first found item
+        // else let user decide
         else
         {
-            mSearchResults->selectFirstItem();
+            mSearchResults->operateOnAll(LLCtrlListInterface::OP_DESELECT);
+            mSearchResults->setFocus(true);
         }
-        mSearchResults->setFocus(true);
-        onCommitSearchResult();
     }
     else
     {