Commit Graph

44986 Commits (b42e468b48471e29387b660e30ea3b6cc3a8979a)

Author SHA1 Message Date
Mnikolenko Productengine b42e468b48 merge fix 2022-03-14 20:40:39 +02:00
Mnikolenko Productengine 6ab4aeb148 SL-16627 Enable auto-adjustments for frist login and update UI 2022-03-09 13:22:26 +02:00
Mnikolenko Productengine f90d179058 Merge branch 'DRTVWR-546' into DRTVWR-539
# Conflicts:
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llcombobox.h
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-03-02 19:46:48 +02:00
Mnikolenko Productengine 064f28b290 merge fix 2022-03-02 00:47:02 +02:00
Mnikolenko Productengine 0aaf5284dc Merge branch 'master' into DRTVWR-539
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-02 00:46:10 +02:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
Nat Goodspeed 6ca09a9455 Increment viewer version to 6.5.4
following promotion of DRTVWR-557
2022-02-28 14:45:27 -05:00
Andrey Kleshchev 92c302d6fb SL-15940 Verify triangle limit
to not trigger an assert inside meshoptimizer
2022-02-25 18:56:54 +02:00
Andrey Kleshchev c141ecdcc2 SL-3787 Fixed sloppy mode returning invalid model
In automatic mode for simple models gradualy increase sloppy decimator until something valid is found.
2022-02-25 13:51:19 +02:00
Dave Parks ba6ca8d45f Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-02-24 13:05:07 -06:00
Dave Parks 658a30bd2e SL-16907 Potential fix for crash in updateSkinInfoMatrixPalette 2022-02-24 13:04:40 -06:00
Andrey Kleshchev 21baea0907 SL-3787 Fixed mesh uploader LoD generation returning worse results than higher lod 2022-02-24 14:42:04 +02:00
Mnikolenko Productengine 1af45ee1df SL-16921 FIXED Viewer crashes on disconnect if 'About land' floater is opened 2022-02-24 13:04:09 +02:00
Dave Parks 85e480616d Fix for mac build 2022-02-23 19:59:46 -06:00
Dave Parks 4f9fa5e817 Fix for some GPUs thinking they have 0 available vram. 2022-02-23 19:53:49 -06:00
Dave Parks fc0b238654 Fix for media textures failing to update (and eating lots of memory) on Mac/Intel 2022-02-23 17:55:44 -06:00
Dave Parks d9a68339d5 SL-16815 and SL-16906 Avoid redundant bumpmap generation, add some assertions around ref counting and (hack) fix crash on shutdown from dangling texture reference (reduced to 1 dangling texture from several hundred, can't find the remaining reference). 2022-02-23 16:51:33 -06:00
Dave Parks 65a28c5d7d Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-02-23 16:04:49 -06:00
Dave Parks 8ffe3b7b30 Fix for mac build 2022-02-23 16:04:31 -06:00
Mnikolenko Productengine 8bd71fe6e8 SL-16904 FIXED The viewer crashes after trying to empty trash containing calling card 2022-02-23 18:38:06 +02:00
Dave Parks 74641a1213 SL-16815 Cleanup -- disable multithreaded bumpmap generation while tracking down loading issues, fix sync issue in single threaded mode in media textures, restore LL_IMAGEGL_THREAD_CHECK functionality 2022-02-22 19:48:01 -06:00
Dave Parks ce534cf32e Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-02-22 15:00:53 -06:00
Dave Parks 1c5c45f273 SL-16815 Fix for broken media texture updates when multithreaded GL is disabled. 2022-02-22 14:58:50 -06:00
Andrey Kleshchev 900c13d361 SL-16892 Fix incorrect width of dropdown menus 2022-02-22 00:05:38 +02:00
Andrey Kleshchev 4e31ff1d7e SL-16056 Load cloud texture only once 2022-02-21 23:11:17 +02:00
Andrey Kleshchev e24acd81e0 SL-16892 Fix crash at getCameraOffsetInitial
getCameraOffsetInitial() call can happen before init()
2022-02-21 21:31:19 +02:00
Mnikolenko Productengine 97f6736d7f Cached setting should be used in draw() calls 2022-02-21 17:46:27 +02:00
Mnikolenko Productengine 9f10853c03 SL-16887 FIXED Crash in LLNetMap::draw 2022-02-21 16:07:58 +02:00
Dave Parks 1461e4d437 SL-16815 Fix for crash when disabling ALM. 2022-02-18 15:52:24 -06:00
Dave Parks 1d378deab5 Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546 2022-02-18 15:38:17 -06:00
Dave Parks 7c90b82ff7 SL-16815 Better occlusion query name pool. Leverage pool FILO nature to avoid reusing a query while the GPU is still chewing on it. 2022-02-18 15:37:55 -06:00
Andrey Kleshchev 74ac4ae0eb SL-16811 Shape preview images do not display all of the attachments. 2022-02-18 22:38:24 +02:00
Dave Parks a8b5ef66a9 SL-16886 Fix for bad batching parameters for some rigged meshes. 2022-02-18 13:14:16 -06:00
Mnikolenko Productengine 882600de2a SL-16627 water reflection detail settings should be affected by auto-adjustment 2022-02-18 18:30:59 +02:00
Mnikolenko Productengine 808684ee4f SL-16841 Disable shadow splits one by one to improve FPS instead of disabling all shadows at once 2022-02-18 15:34:43 +02:00
Dave Parks 0d6aa3c0fe SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and querying for available video memory. 2022-02-17 22:52:23 +00:00
Andrey Kleshchev 892f7d98d5 SL-16861 Animesh and avatar color change fix 2022-02-17 21:29:05 +02:00
Nat Goodspeed a6430f42f3 SL-16842, SL-14300: Merge branch 'DRTVWR-555' into DRTVWR-553-555 2022-02-15 16:11:59 -05:00
Nat Goodspeed f09b0a6a08 SL-16842, SL-14300: Update to viewer-manager build 568552 2022-02-15 16:10:36 -05:00
Dave Parks f47730b92c SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled. 2022-02-14 18:07:24 +00:00
Mnikolenko Productengine 95f7b552ad SL-16841 Skip rendering shadows when decreasing shadow detail setting to avoid stalls 2022-02-14 18:59:55 +02:00
Nat Goodspeed 7491a56144 SL-16842: Merge 'DRTVWR-555' into DRTVWR-553-555 for updater fix. 2022-02-11 13:58:49 -05:00
Nat Goodspeed 78e32d943e SL-16842: Update to viewer-manager build 568451 2022-02-11 13:58:04 -05:00
Nat Goodspeed 9bd45e6fab SL-13792: Merge branch 'DRTVWR-555' into DRTVWR-553-555.
This picks up the change to 32-bit Windows viewer-manager.
2022-02-08 20:09:52 -05:00
Nat Goodspeed 846413c961 DRTVWR-555: Update to viewer-manager build 568310 2022-02-08 20:08:42 -05:00
Andrey Lihatskiy 967707cfd0 Merge branch 'DRTVWR-555' into DRTVWR-553+555
# Conflicts:
#	autobuild.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/viewer_manifest.py
2022-02-08 23:22:59 +02:00
Ansariel Hiller a1b6a271f7 Merged in DRTVWR-553-maint-mix-JK (pull request #856)
Fix template verifier erroneously failing checksum check

Approved-by: Nat Linden
Approved-by: Signal Linden
Approved-by: Andrey Lihatskiy
2022-02-07 21:58:01 +00:00
Nat Goodspeed e37f8c6020 SL-16788: Update to viewer-manager build 568156 2022-02-04 11:58:53 -05:00
Mnikolenko Productengine 7af2d51f57 SL-15923 increase the shortcut level to the minimum required when clicking advanced lighting or shadows settings 2022-02-04 12:46:23 +02:00
Andrey Kleshchev ca26bb40ce SL-16787 Updater launch issues. 2022-02-04 01:36:47 +02:00