summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-04 18:00:06 +0200
committerAndrey Kleshchev <andreykproductengine@lindenlab.com>2023-01-06 17:32:50 +0200
commit366efa4384e6effa6640c9f125756c58c07fcabe (patch)
treef5d38f66a6041ae2e65717a865ab1684db06cbc6 /indra/newview
parent3290f16f29e503115b7eaeb2005cfdbba42668dd (diff)
SL-18741 Add gltf to bulk uploads on mac
And cleaned up dupplicate mScale code
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfilepicker.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfilepicker.cpp b/indra/newview/llfilepicker.cpp
index 1ec25ccaa1..39bac89864 100644
--- a/indra/newview/llfilepicker.cpp
+++ b/indra/newview/llfilepicker.cpp
@@ -608,6 +608,8 @@ std::vector<std::string>* LLFilePicker::navOpenFilterProc(ELoadFilter filter) //
allowedv->push_back("dic");
allowedv->push_back("xcu");
allowedv->push_back("gif");
+ allowedv->push_back("gltf");
+ allowedv->push_back("glb");
case FFLOAD_IMAGE:
allowedv->push_back("jpg");
allowedv->push_back("jpeg");