livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,420 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

150 Commits (98f6ece775fb2f80ef1dbd23506bb9dac291b08d)

Author SHA1 Message Date
Ansariel 98f6ece775 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2022-12-02 19:19:40 +01:00
Andrey Kleshchev 321c7895d0 SL-18741 Basic bulk upload for gltf materials #1 2022-12-02 10:24:23 +02:00
Ansariel b0f88bef63 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-08-30 11:25:02 +02:00
Andrey Kleshchev 4f9f7de33b SL-17653 File filter for local materials and textures in texture picker 2022-08-24 19:35:57 +03:00
Ansariel 536e958018 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	autobuild.xml
#	indra/newview/CMakeLists.txt
#	indra/newview/llface.cpp
#	indra/newview/llfilepicker.h
#	indra/newview/llinventoryicon.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvovolume.h
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/textures/textures.xml
#	indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml
 2022-06-27 17:58:22 +02:00
Dave Parks 6ce3df5514 SL-17653 Flip imported GLTF textures, remove .dae and .glb/.gltf from file dialogs that don't support them 2022-06-23 18:06:55 -05:00
Dave Parks f5d66e79ee SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports the first material in the GLTF file to the Material Editor 2022-06-15 17:03:38 -05:00
Ansariel 8e4abf8ea3 Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer 2022-06-10 13:52:52 +02:00
Dave Houlton 8c0163bcb4 SL-17214 initial loader class skeleton 2022-06-08 13:33:59 -06:00
Zi Ree 8750ff107b Add file types and titles to FLTK file and directory pickers 2022-01-30 20:05:11 +01:00
Nicky 7aed9134a4 Call beforeDialog/afterDialog before opening (fltk) dialog or input queue is blocked. 2022-01-24 17:43:00 +01:00
Nicky cc5f95c229 Remove gtk/atk dependency by using fltk instead. 2021-09-26 20:38:41 +02:00
Ansariel 93f1998a47 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-01-08 23:06:41 +01:00
Dave Houlton 7cd076c796 DRTVWR-510 remove all LL_SOLARIS conditionals 2020-10-08 17:16:22 -06:00
Liny 93f993fb92 fix file picker EXE filtering 2019-06-11 01:23:53 -07:00
Mnikolenko ProductEngine b08065dafd SL-10155 FIXED [MAC] Mesh upload tries to upload folder instead of opening it 2018-12-19 18:39:59 +02:00
Ansariel f9ec853f4a Merge viewer-neko 2019-01-03 19:07:09 +01:00
Ansariel 27441aca1e Tag FS-specific code 2018-06-23 02:35:17 +02:00
Denver Maksim bff51ad716 FIRE-14924: Remember most recently used directory for linux file picker 2017-12-27 03:54:14 -06:00
Ansariel e97c25531c Merge viewer-neko 2018-05-25 22:05:19 +02:00
andreykproductengine 5219e6c455 MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not choose the save directory files within the first minute 2018-04-17 19:25:28 +03:00
Liny b1b7713780 Fix FIRE-22413 [Linux] Upload dialog is missing string "scene_files" (also fixed the same error for xml files) 2018-04-06 16:24:54 -07:00
Ansariel c9e417c8a6 Merge viewer-neko 2017-11-30 01:19:29 +01:00
andreykproductengine 629840e9a8 MAINT-1804 Fixed bulk upload failures due to non-ansi symbols in names 2017-11-22 16:48:54 +02:00
andreykproductengine c877206569 MAINT-1139 Catch Windows crash on Saving snapshot 2017-05-26 15:11:37 +03:00
andreykproductengine fe49c1e8a5 MAINT-1139 Catch Windows crash on Saving snapshot 2017-05-26 15:11:37 +03:00
Nicky 080b10358f FIRE-8051; Make sure filenames do not get cut off via wrong calucation of string length. 2016-11-22 23:48:47 +01:00
Ansariel 2797c5938a Merge Firestorm LGPL 2016-04-05 10:47:23 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nicky c218e524b2 Merge - Step 1; Still enough to do. 2015-10-26 20:20:13 +01:00
Rider Linden fd27f0feb8 MAINT-5507: Include httpconstants in file picker for linux. 2015-09-16 09:09:55 -07:00
Ansariel cc32221af7 Remove one of the XML filepicker types for Mac that doesn't need to be there anymore 2015-01-20 19:59:49 +01:00
Tonya Souther e6130ff458 Compile fix for OS X. 2015-01-20 12:44:15 -06:00
Ansariel 99cbf150a0 Merge LL V3.7.21 2015-01-15 13:55:17 +01:00
Ansariel 1f465086c0 Merge LL V3.7.10 2015-01-11 18:40:22 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
Cinder 19330025ba OPEN-268 - Add missing xml cases to file picker on linux and darwin 2014-08-31 06:17:57 -06:00
Merov Linden c4c8debfc2 Pull merge from lindenlab/viewer-release 2014-06-17 11:12:27 -07:00
Merov Linden 51865f4e94 Pull merge from lindenlab/viewer-release 2014-05-19 21:43:42 -07:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Merov Linden 8dae4bc222 Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
Tank_Master dc353c205a Merge 2014-06-10 20:27:31 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
maxim@mnikolenko 930f407a1c MAINT-3642 FIXED Allow saving textures with extension “.tga” at the end of the name. 2014-01-24 12:12:43 +02:00
Mnikolenko ProductEngine a462c5f14b MAINT-3262 FIXED Allow uploading gif-images 2014-01-14 11:47:40 +02:00
Merov Linden be80b11d30 Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on Mac Cocoa 2013-12-18 11:12:46 -08:00