summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@lindenlab.com>2025-06-27 21:26:55 -0400
committerGitHub <noreply@github.com>2025-06-27 21:26:55 -0400
commitf48fe44684a535ed2eefc64c134551ce72e9ecf4 (patch)
tree601bfe8f31052620321811582244d12a29d6d7a1 /indra/newview/llmaterialeditor.cpp
parent2fdca60e61543309d43f5fa99ba2b40f209aec20 (diff)
parenta50a0e1277386de3456f478127f774fa01cdb578 (diff)
Merge pull request #4306 from secondlife/geenz/develop-to-gltf-mesh
Merge develop into glTF mesh import
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
-rw-r--r--indra/newview/llmaterialeditor.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llmaterialeditor.cpp b/indra/newview/llmaterialeditor.cpp
index 28160177f6..378f5fdf91 100644
--- a/indra/newview/llmaterialeditor.cpp
+++ b/indra/newview/llmaterialeditor.cpp
@@ -137,7 +137,8 @@ LLFloaterComboOptions* LLFloaterComboOptions::showUI(
{
combo_picker->mComboOptions->addSimpleElement(*iter);
}
- combo_picker->mComboOptions->selectFirstItem();
+ // select 'Bulk Upload All' option
+ combo_picker->mComboOptions->selectNthItem((S32)options.size() - 1);
combo_picker->openFloater(LLSD(title));
combo_picker->setFocus(true);