Ansariel
f3bce39d28
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llfile.cpp
# indra/llui/llviewereventrecorder.cpp
2025-10-21 00:24:37 +02:00
Ansariel
36217e7cb3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llwebrtc/llwebrtc.cpp
# indra/llwebrtc/llwebrtc_impl.h
# indra/newview/llvoicewebrtc.cpp
# indra/newview/llvoicewebrtc.h
2025-10-18 12:33:24 +02:00
Hecklezz
24e526a111
Corrected calcDataSizeJ2C change so it compiles on macOS and Linux
2025-10-12 02:05:02 +10:00
Ansariel
b1f05340f8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/pipeline.cpp
2025-10-11 14:41:58 +02:00
Beq
2ab023156b
[FIRE-35987] Slow texture loading (at least partial fix)
...
This fixes a specific issue that has existed for a while so it is not a full fix for FIRE-35987. It will however reduce overfetch and increased data/cache/RAM usage as a result of the overfetch.
2025-10-10 02:14:00 +01:00
Ansariel
b99cf9fb86
Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/00-Common.cmake
# indra/cmake/APR.cmake
# indra/cmake/Audio.cmake
# indra/cmake/Boost.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/Meshoptimizer.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/llaudio/llvorbisencode.cpp
# indra/llcommon/linden_common.h
# indra/llcommon/llcommon.cpp
# indra/llcommon/llfasttimer.cpp
# indra/llcommon/llfasttimer.h
# indra/llcommon/llfile.cpp
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/llthreadsafequeue.h
# indra/llfilesystem/lldir_win32.cpp
# indra/llkdu/llimagej2ckdu.cpp
# indra/llkdu/llimagej2ckdu.h
# indra/llkdu/llkdumem.h
# indra/llplugin/slplugin/CMakeLists.txt
# indra/llrender/llfontfreetype.cpp
# indra/llrender/llfontfreetype.h
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llopenglview-objc.mm
# indra/llwindow/llwindowmacosx-objc.h
# indra/llwindow/llwindowwin32.cpp
# indra/media_plugins/cef/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/pipeline.cpp
# indra/newview/viewer_manifest.py
2025-09-05 14:55:37 +02:00
Rye
ba30737d8f
Merge branch 'develop' of github.com:secondlife/viewer into rye/infinitemac
2025-08-20 18:04:55 -04:00
Ansariel
478a51f8e3
Merge branch 'release/2025.06' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llxml/llcontrol.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/lllogchat.cpp
# indra/newview/llreflectionmap.h
2025-08-13 20:52:47 +02:00
Andrey Kleshchev
82e6e42b9e
#4527 Crash trying to upload a huge image
...
Raw image permits only a 256 MB buffer so this isn't unexpected.
2025-08-13 00:21:28 +03:00
Ansariel
355a80ab91
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llfloaterworldmap.h
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/floater_world_map.xml
2025-05-23 13:13:24 +02:00
TommyTheTerrible
ac5d59b939
calcDataSizeJ2C Adjust curve for more than 6 layers ( #4018 , #4020 )
...
KDU is uploading 2k files with 7 and 8 layers which is shifting the location of discard 1 and 2.
To accommodate, this commit adds a max_layer check based on max_dimension and the MAX_BLOCK_SIZE to allow the extra layers for 2k.
Also shifted the starting size to the MIN_LAYER_SIZE instead of MAX_BLOCK_SIZE's area to allow smaller files to be decoded at discard 5 completely.
Finally able to walk around Fantasy Faire without any gray blobs!
2025-05-05 10:00:36 +03:00
Ansariel
fef4f9a07e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llcharacter/llcharacter.cpp
# indra/llcharacter/llcharacter.h
# indra/llcharacter/lljoint.cpp
# indra/llcharacter/lljoint.h
# indra/llimage/llimagedimensionsinfo.cpp
# indra/llprimitive/lldaeloader.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelprofilepicks.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
# indra/newview/llwatchdog.cpp
# indra/newview/llwatchdog.h
2025-05-03 15:45:54 +02:00
Ansariel Hiller
47015ed0b7
Fix memory leak in LLImageDimensionsInfo ( #2679 )
2025-04-18 23:10:40 +03:00
Rye
4a56738e4f
Disable LLImageJPEG setjmp hack when building on ARM to avoid crash
2025-02-11 05:04:10 -05:00
Ansariel
8fd20a1af6
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-10-16 19:11:04 +02:00
Beq
b268c8236a
FIRE-34564 - bugsplat assertion mismatched locks in snapshot
...
relax the lock on the filter.
2024-10-07 17:24:47 +01:00
Ansariel
193fb1627f
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewermedia.cpp
2024-09-19 23:04:19 +02:00
Andrey Kleshchev
25969b330e
viewer#2608 Crash at LLSnapshotLivePreview::getFormattedImage
2024-09-19 20:56:10 +03:00
Ansariel
64b6587eec
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llworldmapview.cpp
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2024-09-09 19:48:04 +02:00
TommyTheTerrible
2f692fbac3
Update calcDataSizeJ2C to stop undersized blocks ( #2525 )
...
The initial block area for the pyramid walk should not be smaller than the max_block_size area so need an llmax to not allow multiplication below 1.
This was causing decode errors for complex small images (128x128 or smaller) on discard 1 and 2.
2024-09-09 12:31:00 +03:00
Ansariel
9573cc8e00
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/es/notifications.xml
# indra/newview/skins/default/xui/fr/notifications.xml
# indra/newview/skins/default/xui/it/notifications.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/pt/notifications.xml
# indra/newview/skins/default/xui/ru/notifications.xml
2024-08-27 19:39:23 +02:00
TommyTheTerrible
17f515cd3e
Update LLImageJ2C::calcDataSizeJ2C for better 2k image support ( #2406 )
...
Adjusted calculations based on dimensions and assumed maximum block size so that higher discards (4-5) of 2048x2048 images can be decoded with aux/alpha.
(It should also work for dimensions larger than 2048.)
This function will now return a reliable discard 5 data size for unknown dimensions (w and/or h equals 0), which could be used in LLTextureFetch::createRequest to skip the header fetch and go right to a discard 5 decode.
Tested on OpenJPEG 2.5 with partial decode support (opj_decoder_set_strict_mode set to false).
Should work on KDU fine but might be a good idea to test.
2024-08-24 07:21:03 +03:00
Ansariel
830eeaa6ff
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llface.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewertexturelist.cpp
2024-08-21 00:46:46 +02:00
Ansariel Hiller
9f7dd01772
Clean up boost includes and remove compiler warning pragma for unreachable code in PCH ( #2361 )
2024-08-20 18:41:48 +03:00
Ansariel
07228d3a9e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/LLPrimitive.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/Tracy.cmake
# indra/llappearance/llavatarappearancedefines.cpp
# indra/llcommon/llprofiler.cpp
# indra/llcommon/llprofiler.h
# indra/llfilesystem/lldiskcache.cpp
# indra/llfilesystem/lldiskcache.h
# indra/llinventory/llinventorytype.cpp
# indra/media_plugins/example/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llgroupmgr.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatarself.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/viewer_manifest.py
2024-08-15 00:12:13 +02:00
Rye Mutt
b5e306f7d8
Enable /permissive- on MSVC for better standards conformance ( #2251 )
...
* Enable /permissive- on MSVC for better C++ conformance and fix related errors
* Clean up left over warning suppressions from old library or msvc versions
2024-08-14 08:01:02 -07:00
Ansariel
e17c906698
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/newview/llcontrolavatar.cpp
# indra/newview/lldrawpoolterrain.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-07-22 20:58:53 +02:00
TommyTheTerrible
bffd4a12b8
calcDataSizeJ2C adjusted to use maximum possible components ( #2073 )
...
Previous pyramid walking calculation (#2032 ) assumed the incoming components variable can be accurate but unfortunately the needs_aux is only set to true if the face has an alpha mask setting.
Without this information we must assume the J2C files have the maximum component size of four so that alpha channels are found when decoding both the color and aux textures.
2024-07-20 13:37:23 +03:00
Ansariel
0a83a1e6b7
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentbenefits.cpp
# indra/newview/llagentbenefits.h
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelsnapshot.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpreviewscript.cpp
# indra/newview/llsnapshotlivepreview.cpp
2024-07-18 20:04:45 +02:00
Ansariel Hiller
6535ce51fd
Remove unnecessary code and (re-)add some more compile time constants ( #2057 )
2024-07-18 10:48:24 +03:00
TommyTheTerrible
2f83b0aed2
Fix: Update calcDataSizeJ2C to pyramid-base file size estimation ( #2032 )
...
* Fix: Update calcDataSizeJ2C to pyramid-base file size estimation
Used the loop from the previous LayerFactored method to create a more accurate file size estimation by walking up the pyramid tiles.
Sizes are much larger in many cases and eliminate partial decoder issues with OpenJPEG.
KDU not tested but expected to produce better files as well.
Should also stop decode failures on tiny or very rectangular dimensions.
---------
Co-authored-by: Andrey Lihatskiy <alihatskiy@productengine.com>
2024-07-17 04:02:57 +03:00
Ansariel
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
Ansariel
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
Ansariel
364a14a8aa
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofilercategories.h
2024-06-21 22:45:12 +02:00
Ansariel
77374d9fbc
Fix texture fetch request getting canceled if request counter flips over
2024-06-21 12:56:57 +02:00
Ansariel
c29a661b22
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llglslshader.cpp
# indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl
# indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl
# indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl
# indra/newview/gltf/accessor.cpp
# indra/newview/gltf/accessor.h
# indra/newview/gltf/animation.h
# indra/newview/gltf/asset.cpp
# indra/newview/gltf/primitive.cpp
# indra/newview/gltf/primitive.h
# indra/newview/gltfscenemanager.h
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llimprocessing.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-13 01:54:18 +02:00
Brad Linden
9775d7ea10
Merge remote-tracking branch 'origin/release/maint-a' into project/gltf_development
2024-06-11 17:42:17 -07:00
Ansariel
d99fbffb6d
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/newview/gltf/asset.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvovolume.cpp
2024-06-11 20:25:22 +02:00
Ansariel
18903f6cac
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 19:04:21 +02:00
Ansariel
1bbe697db7
Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llappearance/llavatarappearance.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvocache.cpp
2024-06-11 14:38:20 +02:00
Ansariel
d9789bfaf2
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llappearance/llavatarappearance.h
# indra/llimage/llimage.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llrendertarget.cpp
# indra/llrender/llshadermgr.cpp
# indra/newview/lldynamictexture.cpp
# indra/newview/llenvironment.cpp
# indra/newview/llfetchedgltfmaterial.cpp
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterimagepreview.h
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterregioninfo.h
# indra/newview/llmaniprotate.cpp
# indra/newview/llmaniptranslate.cpp
# indra/newview/llpanelvolume.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llselectmgr.h
# indra/newview/llsurface.cpp
# indra/newview/llsurface.h
# indra/newview/llsurfacepatch.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltinygltfhelper.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llviewerwindow.h
# indra/newview/llvlcomposition.cpp
# indra/newview/llvlcomposition.h
# indra/newview/llvocache.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2024-06-11 13:38:43 +02:00
Brad Linden
7c42711ca3
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development
2024-06-10 16:22:12 -07:00
Ansariel
591c75ebaf
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llmath/llvolume.cpp
# indra/llmessage/llcorehttputil.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/darwin/apple-notarize.sh
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llfloater360capture.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/viewer_manifest.py
2024-06-10 21:53:31 +02:00
Ansariel
c0fad3028f
Re-enable compiler warnings C4018, C4100, C4231 and C4506
2024-06-10 16:42:43 +02:00
Ansariel
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
Ansariel
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
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
ea5ead6f4a
Merge remote-tracking branch 'FS600/master'
...
# Conflicts:
# doc/contributions.txt
# indra/llimage/tests/llimageworker_test.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
2024-05-23 18:15:07 +02:00
Ansariel
4ba5497928
Merge remote-tracking branch 'LL/DRTVWR-600-maint-A'
...
# Conflicts:
# FIRESTORM-SOURCE_LICENSE_HEADER.txt
# 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.h
# indra/llcommon/llprofiler.cpp
# indra/llimage/llimageworker.cpp
# indra/media_plugins/cef/dummy_volume_catcher.cpp
# indra/newview/CMakeLists.txt
# indra/newview/fsslurlcommand.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.h
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llpreviewtexture.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/pieseparator.cpp
2024-05-22 23:53:27 +02:00