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