Merge pull request #4380 from secondlife/andreyk/gltf_mesh_import

Merge develop into gltf mesh import

Author: akleshchev

.github/pull_request_template.md

@@ -0,0 +1,36 @@
+## Description
+
+<!--
+Describe what this PR changes or adds. Include any relevant context or motivation.
+-->
+
+## Related Issues
+
+- [ ] **Please link to a relevant GitHub issue for additional context.**
+  - **Bug Fix:** Link to an issue that includes reproduction steps and testing guidance.
+  - **Feature/Enhancement:** Link to an issue with a write-up, rationale, and requirements.
+
+Issue Link: <!-- e.g., closes #123 or relates to #456 -->
+
+---
+
+## Checklist
+
+Please ensure the following before requesting review:
+
+- [ ] I have provided a clear title and detailed description for this pull request.
+- [ ] The PR is linked to a relevant issue with sufficient context.
+- [ ] I have tested the changes locally and verified they work as intended.
+- [ ] All new and existing tests pass.
+- [ ] Code follows the project's style guidelines.
+- [ ] Documentation has been updated if needed.
+- [ ] Any dependent changes have been merged and published in downstream modules
+- [ ] I have reviewed the [contributing guidelines](https://github.com/secondlife/viewer/blob/develop/CONTRIBUTING.md).
+
+---
+
+## Additional Notes
+
+<!--
+Add any other information, screenshots, or suggestions for reviewers here.
+-->

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
     {

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;

indra/newview/lltoolpie.h

@@ -94,8 +94,8 @@ class LLToolPie : public LLTool, public LLSingleton<LLToolPie>
         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)

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"