diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-15 22:19:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-15 22:19:15 +0300 |
| commit | 06a76eda6af9fbe36e40a749c44e590ad6cfe363 (patch) | |
| tree | 8e269e6e11880d316c9358c6654479c17f644b08 /indra/newview/llfloaterworldmap.cpp | |
| parent | ae931987356a71dbe8fc7ec31f2a2fe9108b4495 (diff) | |
| parent | 293462d8ff6dcb00ec501d026a6589d869a2f846 (diff) | |
Merge branch 'develop' into marchcat/05-develop
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 30ed723db6..a798ba31ee 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(); |