diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-07-17 11:23:10 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-07-17 11:23:51 +0300 |
| commit | 6e186befad1eafd091a38c9e4d6b58cc09926e57 (patch) | |
| tree | c128d6fcbd9482dbe31092ac34bb9d31f69f6255 /indra/newview/llmaterialeditor.cpp | |
| parent | 58420b8e63d2f5ac6a0ebe858a34061b16c9c16b (diff) | |
Reapply "Merge develop into glTF mesh import"
To simplify merging into mesh import branch
This reverts commit b0c951ffe348f478f27a85720cc7aeffea32fe73.
Diffstat (limited to 'indra/newview/llmaterialeditor.cpp')
| -rw-r--r-- | indra/newview/llmaterialeditor.cpp | 3 |
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); |