diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-07-17 15:35:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-17 15:35:10 +0300 |
| commit | 33bc6edb3df4ce456aad2bb44ef6be18bbeea882 (patch) | |
| tree | 29060338756c240e11702c6ee4eb7b67524b755f /indra | |
| parent | 7a33f2279be82e32acd6e25245026dc305b1ed2b (diff) | |
| parent | af3ef42d40e7b5eb2a9ba0b45ed74bbf7aa18656 (diff) | |
Merge pull request #4380 from secondlife/andreyk/gltf_mesh_import
Merge develop into gltf mesh import
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloaterworldmap.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/lltoolpie.h | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_sound.xml | 2 |
4 files changed, 9 insertions, 8 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 { diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 75b980d358..618955c83b 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1527,7 +1527,7 @@ bool LLToolPie::shouldAllowFirstMediaInteraction(const LLPickInfo& pick, bool mo return false; } // Any object with PRIM_MEDIA_FIRST_CLICK_INTERACT set to TRUE - if(FirstClickPref & MEDIA_FIRST_CLICK_ANY) + if((FirstClickPref & MEDIA_FIRST_CLICK_ANY) == MEDIA_FIRST_CLICK_ANY) { LL_DEBUGS_ONCE() << "FirstClickPref & MEDIA_FIRST_CLICK_ANY" << LL_ENDL; return true; diff --git a/indra/newview/lltoolpie.h b/indra/newview/lltoolpie.h index ee7945d16f..d9daad9515 100644 --- a/indra/newview/lltoolpie.h +++ b/indra/newview/lltoolpie.h @@ -94,8 +94,8 @@ private: MEDIA_FIRST_CLICK_NONE = 0, // Special case: Feature is disabled MEDIA_FIRST_CLICK_HUD = 1 << 0, // 0b00000001 (1) MEDIA_FIRST_CLICK_OWN = 1 << 1, // 0b00000010 (2) - MEDIA_FIRST_CLICK_GROUP = 1 << 2, // 0b00000100 (4) - MEDIA_FIRST_CLICK_FRIEND = 1 << 3, // 0b00001000 (8) + MEDIA_FIRST_CLICK_FRIEND = 1 << 2, // 0b00000100 (4) + MEDIA_FIRST_CLICK_GROUP = 1 << 3, // 0b00001000 (8) MEDIA_FIRST_CLICK_LAND = 1 << 4, // 0b00010000 (16) // Covers any object with PRIM_MEDIA_FIRST_CLICK_INTERACT (combines all previous flags) diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index 473e54812d..de6132aec6 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -410,7 +410,7 @@ <item label="Friends' objects" name="media_first_click_friend" - value="11"/> + value="7"/> <item label="Group objects" name="media_first_click_group" |