Dave Parks
|
2f41200384
|
Remove tinygltf dependency from LL::GLTF (#1541)
* #1535 Image loading/saving support in boost::json driven GLTF parser
* #1536 GLB Support in boost::json drvien GLTF parser
|
2024-05-28 09:45:40 -05:00 |
|
Brad Linden
|
a1f49564d6
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
|
2024-05-23 11:31:19 -07:00 |
|
Ansariel
|
e2e37cced8
|
Fix line endlings
|
2024-05-22 22:40:26 +03:00 |
|
Ansariel
|
1b67dd855c
|
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
|
2024-05-22 19:04:52 +02:00 |
|
Dave Parks
|
155ddf2336
|
Merge pull request #1421 from secondlife/DRTVWR-600-maint-A
Drtvwr 600 maint a
|
2024-05-07 09:47:37 -05:00 |
|
Alexander Gavriliuk
|
f9473e8afc
|
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
|
2024-05-07 10:18:51 +02:00 |
|
RunitaiLinden
|
c6d752b880
|
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
|
2024-05-06 16:48:58 -05:00 |
|
Andrey Lihatskiy
|
38c2a5bde9
|
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
|
2024-05-01 08:16:58 +03:00 |
|
RunitaiLinden
|
5e2bac01cb
|
#1357 GLTF Export Prototype
|
2024-04-30 17:26:48 -05:00 |
|
Andrey Lihatskiy
|
1b68f71348
|
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
|
2024-04-29 07:56:09 +03:00 |
|
RunitaiLinden
|
c1bde75768
|
HDRI Local Preview (#953)
* #926 WIP - HDRI import prototype v0
* #926 WIP -- add OpenEXR to autobuild.xml
* #926 WIP -- Add OpenEXR cmake
* #926 WIP -- Attempt at using OpenEXR autobuild package and don't hard code .exr file to load
* #926 Unmangle autobuild.xml and get dll's in the right place (thanks, Caladbolg!)
* implement mac shared libs plumbing for OpenEXR for secondlife/viewer#926
* Fix Xcode/clang compile error regarding new[]/delete[] mismatch
* #926 HDRI Preview finishing touches.
- Full ACES when HDRI is enabled
- Fix for probes getting stuck paused
- Add exposure and rotation controls
---------
Co-authored-by: Brad Linden <brad@lindenlab.com>
|
2024-03-08 12:01:20 -06:00 |
|
Ansariel
|
60d3dd98a4
|
Convert remaining BOOL to bool
|
2024-02-21 23:14:31 +02:00 |
|
Andrey Lihatskiy
|
27dae1d967
|
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
|
2023-11-30 13:30:27 +02:00 |
|
Andrey Kleshchev
|
9b27b6e509
|
SL-13610 [MAC] WIP List HID available devices in joystick selection
Doesn't filter the list yet, just shows full list of usb devices
Selecting visible devices doesn't work yet
|
2023-10-23 15:26:19 +03:00 |
|
Brad Linden
|
f9f5b538b2
|
DRTVWR-559 fix for lines lost in the merge
|
2023-07-17 15:50:59 -07:00 |
|
Brad Linden
|
f975cfd736
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-07-17 13:37:03 -07:00 |
|
Andrey Lihatskiy
|
7140640b69
|
DRTVWR-580 Post-merge fix - unused code
|
2023-05-19 02:31:28 +03:00 |
|
Brad Linden
|
2f44377b3e
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-05-17 11:17:48 -07:00 |
|
Andrey Lihatskiy
|
4dcab10bf8
|
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
|
2023-05-17 17:47:45 +03:00 |
|
Brad Linden
|
a548c16989
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-03-29 14:54:06 -07:00 |
|
Andrey Lihatskiy
|
7b2205d8f6
|
Merge branch 'main' into DRTVWR-580-maint-T
|
2023-03-30 00:39:12 +03:00 |
|
Andrey Lihatskiy
|
5217e6bfb7
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
|
2023-03-30 00:25:16 +03:00 |
|
Andrey Lihatskiy
|
dca3c83cd9
|
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
|
2023-03-20 01:23:16 +02:00 |
|
Maxim Nikolenko
|
e72e4250c5
|
SL-19316 fix filter for GLTF materials on mac (#101)
|
2023-03-03 00:38:46 +02:00 |
|
Maxim Nikolenko
|
fe21f3fdf1
|
SL-19252 Remove "#ifdef _CORY_TESTING" code
|
2023-02-23 11:58:17 +02:00 |
|
Andrey Kleshchev
|
6c54c9f8a9
|
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
|
2023-02-09 22:33:52 +02:00 |
|
Brad Linden
|
5fabfa50d7
|
Merge remote-tracking branch 'origin/main' into DRTVWR-559
|
2023-02-02 12:11:40 -08:00 |
|
Andrey Kleshchev
|
27080dc7f7
|
SL-18996 make MacOS picker dialogs modeless to avoid disconnects #2
|
2023-01-27 17:25:18 +02:00 |
|
Andrey Kleshchev
|
2398a28af6
|
SL-18996 [WIP] MacOS make picker dialogs non-modal to avoid disconnects #1
|
2023-01-27 17:25:18 +02:00 |
|
Andrey Kleshchev
|
366efa4384
|
SL-18741 Add gltf to bulk uploads on mac
And cleaned up dupplicate mScale code
|
2023-01-06 17:32:50 +02:00 |
|
Andrey Kleshchev
|
321c7895d0
|
SL-18741 Basic bulk upload for gltf materials #1
|
2022-12-02 10:24:23 +02:00 |
|
Rye Mutt
|
662dd44587
|
Fix leaks in mac filepicker code
|
2022-10-28 18:49:32 -04:00 |
|
Andrey Kleshchev
|
4f9f7de33b
|
SL-17653 File filter for local materials and textures in texture picker
|
2022-08-24 19:35:57 +03: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 |
|
Dave Houlton
|
8c0163bcb4
|
SL-17214 initial loader class skeleton
|
2022-06-08 13:33:59 -06:00 |
|
Nicky
|
0319ed6611
|
Another instance where LLFilePicker::getSaveFile had the wrong number of arguments.
|
2022-04-18 17:05:31 +02:00 |
|
Nicky
|
b532c2986b
|
Add argument missing from implementation
|
2022-04-18 16:47:54 +02:00 |
|
Dave Houlton
|
7cd076c796
|
DRTVWR-510 remove all LL_SOLARIS conditionals
|
2020-10-08 17:16:22 -06: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 |
|
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 |
|
andreykproductengine
|
629840e9a8
|
MAINT-1804 Fixed bulk upload failures due to non-ansi symbols in names
|
2017-11-22 16:48:54 +02:00 |
|
andreykproductengine
|
fe49c1e8a5
|
MAINT-1139 Catch Windows crash on Saving snapshot
|
2017-05-26 15:11:37 +03:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Rider Linden
|
fd27f0feb8
|
MAINT-5507: Include httpconstants in file picker for linux.
|
2015-09-16 09:09:55 -07: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 |