diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-10-15 16:03:08 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-10-15 16:03:08 -0400 |
| commit | 64ecc38c841ae0cb0c3d0ccb9b1bf543ecf4230e (patch) | |
| tree | 24a954501d239ecaa43fe17f6f931e720383c6c2 /indra/newview/llfloaterworldmap.cpp | |
| parent | a2ae46ef3a0036a6030ccc1e3ef4fcdfb7f455f3 (diff) | |
| parent | cd712960f316496b29c53dce390dd778ad9d27f4 (diff) | |
Merge branch 'develop' into maxim/lua-nearby-avatars
Diffstat (limited to 'indra/newview/llfloaterworldmap.cpp')
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index dda7266220..4674cd68b6 100755 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -486,8 +486,11 @@ void LLFloaterWorldMap::onOpen(const LLSD& key) const LLUUID landmark_folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_LANDMARK); LLInventoryModelBackgroundFetch::instance().start(landmark_folder_id); - mLocationEditor->setFocus( true); - gFocusMgr.triggerFocusFlash(); + if (hasFocus()) + { + mLocationEditor->setFocus( true); + gFocusMgr.triggerFocusFlash(); + } buildAvatarIDList(); buildLandmarkIDLists(); |