summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialeditor.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-30 17:55:17 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-30 17:55:17 +0800
commitd1353441f91d5776e1f4e72666f7c9de96eecca5 (patch)
treecd22d6ac18a1b64cb5c2a94f793e7d7cf27a8b4b /indra/newview/llmaterialeditor.cpp
parent2c8521de6d357d74f5b256cc2f94e9951e654d83 (diff)
parent136149d1a196d2c0c15b9977937e64ccd26c1a49 (diff)
Merge remote-tracking branch 'secondlife/project/gltf-mesh-import' 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);