a2971d84d5
Viewer#779 Make RenderMaxVRAMBudget more consistent
2024-02-15 19:31:41 +02:00
2e5b105dff
SL-18721 Shutdown fixes #4
2024-02-08 01:34:39 +02:00
c5d1bd8e34
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# README.md
2024-01-30 13:33:03 +01:00
ee7c3ea792
SL-18721 Shutdown fixes #3
...
Fix dialog box being blank in task bar
2024-01-29 22:11:35 +02:00
04d32cf7eb
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llviewermenu.cpp
# indra/newview/skins/default/xui/en/floater_scene_load_stats.xml
# indra/newview/skins/default/xui/en/floater_world_map.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_sound.xml
# indra/newview/skins/default/xui/en/panel_profile_pick.xml
# indra/newview/skins/default/xui/en/panel_volume_pulldown.xml
# indra/newview/skins/default/xui/en/sidepanel_item_info.xml
2024-01-26 14:29:44 +01:00
80ebb1fd34
Revert "Revert "Revert "Revert "Revert changes for FIRE-32453 to try out the fix from LL"" once again to try out new fix attempt from LL"" and again for LL's next ongoing attempt to fix it
...
This reverts commit f5390ea331
2024-01-26 13:30:48 +01:00
5c7903bfdc
Crash in switch context
...
Looks like a crash at SetWindowLongPtr due to handle being zero
2024-01-25 19:02:57 +02:00
4a34a11966
SL-18721 Shutdown fixes
...
1. After window closes viewer still takes some time to shut down, so
added splash screen to not confuse users (and to see if something gets
stuck)
2. Having two identical mWindowHandle caused confusion for me, so I
split them. It looks like there might have been issues with thread being
stuck because thread's handle wasn't cleaned up.
3. Made region clean mCacheMap immediately instead of spending time
making copies on shutdown
2024-01-22 18:47:43 +02:00
0a292ab51d
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-09 10:21:07 +01:00
afe91b7eb6
Merge main (DRTVWR-596 GLTF Materials Maint) into DRTVWR-591-maint-X
...
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
2024-01-08 21:33:06 +02:00
a666e640c8
Merge branch 'DRTVWR-596' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-08 00:10:01 +01:00
300d7629d8
SL-20664 Potential fix for crash on startup in switchContext
2023-12-06 11:58:45 -06:00
c06fa64758
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvosky.cpp
2023-12-01 13:10:11 +01:00
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
63f30264ff
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltransutil.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/newview/app_settings/settings.xml
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llinspectavatar.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llviewerjoystick.cpp
2023-10-26 20:58:56 +02:00
92f2cf6089
SL-13610 build fix
2023-10-23 16:08:46 +03:00
3084f86417
SL-13610 [MAC] Manufacturer based search
2023-10-23 15:26:19 +03:00
453a4a13f8
SL-13610 [MAC] WIP enable initing devices by local id
2023-10-23 15:26:19 +03:00
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
4532e17e3d
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llpanelface.cpp
2023-09-20 15:07:19 +02:00
5b2de090c1
SL-20177: Blind attempt at fixing crash in SetWindowLongPtr. Guess based on the fact that crashes started around the time VRAM accounting was added.
2023-09-19 10:40:03 -07:00
b80c6e1462
Re-enable VRAM stats debug output
2023-08-28 16:23:54 +02:00
82e80b7726
Revert "Revert changes for FIRE-32453 to try out the fix from LL"
...
This reverts commit c1fbf5e3c2
2023-07-07 21:17:29 +02:00
d80a1dee15
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
2023-07-07 21:16:55 +02:00
79198eddf7
SL-19966 Reverted "SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption"
...
This reverts commit cf692c40b0
2023-07-07 20:26:05 +03:00
8e9b3a8f37
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llaudio/llaudiodecodemgr.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/llvoavatar.h
# indra/newview/pipeline.cpp
2023-05-12 12:06:57 +02:00
69d444826d
Merge pull request #208 from secondlife/SL-19690
...
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
2023-05-10 09:14:14 -04:00
3f1f126186
DRTVWR-559 Remove main window proc printf debugging.
2023-05-08 15:21:04 -05:00
026ef1935d
SL-19690: Follow up on Rye Mutt's fix for shutdown crashes.
...
Rather than continuing to propagate try/catch (Closed)
(aka LLThreadSafeQueueInterrupt) constructs through the code base, make
WorkQueueBase::post() return bool indicating success (i.e. ! isClosed()).
This obviates postIfOpen(), which no one was using anyway.
In effect, postIfOpen() is renamed post(), bypassing the exception when
isClosed().
Review existing try/catch blocks of that sort, changing to test for post()
returning false.
2023-05-08 12:07:31 -04:00
9057bfc995
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llcallstack.h
# indra/llinventory/llsettingssky.cpp
# indra/llmath/llvolume.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llviewerstats.cpp
# indra/newview/llvoavatar.cpp
2023-05-05 12:35:33 +02:00
21ddaa6908
DRTVWR-559: Merge remote branch 'DRTVWR-559' into DRTVWR-559-zapfunc
...
Delete the debugLoggingEnabled() (changed to LL_DEBUGS()) stanzas deleted by
the upstream.
2023-05-03 10:01:39 -04:00
2a10bd406c
DRTVWR-559: Replace debugLoggingEnabled() function with LL_DEBUGS().
...
The trouble with debugLoggingEnabled() is that it locked mutexes and searched
maps every time that call was reached. LL_DEBUGS() has the same functionality
(albeit with idiosyncratic syntax) but performs expensive lookups only once
per session, caching the result in a local static variable.
2023-05-03 09:55:31 -04:00
b318e24f25
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llglslshader.cpp
# indra/newview/lldrawable.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-05-03 14:59:31 +02:00
e09475713b
DRTVWR-559 Optimization pass, make it so profileAvatar can read back GPU timer without a frame stall.
2023-05-02 18:47:21 -05:00
523662a5c8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-05-02 18:22:32 +02:00
504ef7e9e3
Merge branch 'main' into DRTVWR-580-maint-T
2023-05-02 17:39:29 +03:00
ffa21ae649
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539
...
# Conflicts:
# autobuild.xml
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable_linux.txt
# indra/newview/fsfloaterperformance.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llfeaturemanager.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-04-28 00:39:47 +02:00
369945b45d
Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539
2023-04-26 15:38:47 -07:00
68e5f326b3
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# indra/cmake/00-Common.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/GLEXT.cmake
# indra/cmake/LLCommon.cmake
# indra/cmake/LLMath.cmake
# indra/cmake/LLRender.cmake
# indra/cmake/Tracy.cmake
# indra/llprimitive/CMakeLists.txt
# indra/llrender/llglheaders.h
# indra/llrender/llglslshader.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/llface.cpp
# indra/newview/lltexturefetch.h
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llxmlrpctransaction.cpp
2023-03-31 18:54:16 +02:00
afd49409a7
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/cmake/FreeType.cmake
# indra/cmake/ViewerMiscLibs.cmake
2023-03-31 16:56:37 +02:00
41d24952ff
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/llfloateravatarrendersettings.cpp
2023-03-31 17:17:21 +03:00
c7fe346ff0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llimagegl.cpp
2023-03-30 13:06:36 +02:00
a548c16989
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-03-29 14:54:06 -07:00
7b2205d8f6
Merge branch 'main' into DRTVWR-580-maint-T
2023-03-30 00:39:12 +03:00
2c51fe5aad
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llvovolume.cpp
2023-03-22 17:35:43 +01:00
c1fbf5e3c2
Revert changes for FIRE-32453 to try out the fix from LL
2023-03-22 16:38:27 +01:00
cf692c40b0
SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption
2023-03-20 21:08:42 +01:00
5323ccf3b3
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/llprofilercategories.h
# indra/llcommon/lluuid.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/featuretable.txt
# indra/newview/llagent.cpp
# indra/newview/llface.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewertexture.cpp
2023-03-20 11:14:08 +01:00
25ede86382
SL-19172 Texture streaming tune up. Incidental decruft.
2023-03-10 10:52:35 -06:00
8385b6a7dd
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/pipeline.cpp
# indra/newview/pipeline.h
2023-02-10 11:30:38 +01:00
95de63eaa3
DRTVWR-559 Remove some 32-bit color paranoia checks (potential fix for running under wine)
2023-02-08 11:10:15 -06:00
06ac6c615c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# doc/contributions.txt
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
2023-02-03 15:34:47 +01:00
f7f941ae5b
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llfilesystem/lldiskcache.cpp
2023-02-03 13:06:40 +01:00
130ac29ea6
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-02-03 12:58:42 +01:00
afde13580c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
2023-02-01 10:26:07 +01:00
291253d932
FIRE-32105: Application icon flashes also while viewer has focus
2023-01-27 21:30:20 +01:00
b4fde14f09
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llrender/llimagegl.cpp
# indra/llrender/llrender.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/llface.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llspatialpartition.h
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2023-01-19 23:04:50 +01:00
7bd9d21e19
Optimizations, decruft, and intel compatibility pass ( #53 )
...
SL-18869, SL-18772 Overhaul VBO management, restore occlusion culling, intel compatibility pass, etc
2023-01-19 09:13:45 -06:00
472ecc8088
SL-18999 IME disabling should be called in window's thread
...
For some reason positioning IME window works fine, but disabling and enabling ime works from window's thread only
2023-01-19 01:45:57 +02:00
89f3bf6c13
SL-18985 Crash at std::basic_string::erase
2023-01-18 19:20:36 +02:00
b157ab47c0
Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llagentui.cpp
# indra/newview/llcallingcard.cpp
# indra/newview/llfloateravatarrendersettings.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/de/floater_tools.xml
# indra/newview/skins/default/xui/en/floater_display_name.xml
# indra/newview/skins/default/xui/en/floater_tools.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/ru/floater_tools.xml
2023-01-12 16:56:08 +01:00
f9866a3543
Merge branch 'main' into DRTVWR-573-maint-R
...
# Conflicts:
# autobuild.xml
# indra/newview/llagent.cpp
# indra/newview/llimview.cpp
# indra/newview/llimview.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpanelmediasettingsgeneral.cpp
# indra/newview/pipeline.cpp
2023-01-12 04:37:42 +02:00
c2d26cced9
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/pipeline.cpp
2023-01-04 17:10:49 +01:00
0de318cb5e
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llwindow/llwindowwin32.cpp
2023-01-04 15:30:47 +01:00
0c9d4db072
[FIRE-32453][BUG-232971] Orderly shutdown of event queues
...
Terminate related queues before the windows thread to avoid loops.
Also increase timeout on queue full wait as we don't expect to see this so often now.
2023-01-03 18:50:24 +00:00
6c4ba94b25
[FIRE-32453][BUG-232971] Further edge cases for thread hangs on exit
2023-01-03 10:02:01 +00:00
426ebef98c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/threadpool.h
# indra/llwindow/llwindowwin32.cpp
2022-12-23 11:23:30 +01:00
e1479bd185
[FIRE-32453][BUG-232971] Improve shutdown behaviour. (Ty Rick Daylight)
...
Alter close down behaviour to ensure that the main UI window remains open until the process finishes persisting data and other close down activities.
2022-12-21 02:07:58 +00:00
fc5119635b
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/pipeline.cpp
2022-12-19 22:51:09 +01:00
351442cc42
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-12-19 22:43:39 +01:00
92656117ba
Sundry additional debugs to help trace hang on exit in windows
2022-12-17 16:39:35 +00:00
89f21f276f
SL-18719 GL 3.0/3.1 compatibility pass.
2022-12-16 14:58:02 -06:00
b13c69ddac
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/llrender/llimagegl.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexture.h
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/notifications.xml
2022-12-14 10:37:17 +01:00
f7063cecdd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llmath/llvolume.cpp
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llappviewer.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewertexturelist.h
2022-12-14 10:13:07 +01:00
15f55c0a88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
2022-12-13 18:03:50 +01:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
eb526fec0a
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2022-12-12 17:59:34 -08:00
2ab424493f
DRTVWR-559 Fix for windows build.
2022-12-12 13:49:28 -06:00
13a509fe05
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterpreference.cpp
# indra/newview/llpanelface.h
# indra/newview/llviewerregion.h
# indra/newview/llviewerwindow.cpp
2022-11-30 22:51:52 +01:00
87bb72a47a
SL-18154 WIP -- CPU sampling (AMD uProf) profile guided optimizations to reduce CPU usage of background threads.
2022-11-30 13:25:00 -06:00
b5db671f7c
SL-18682 WIP -- Add debug settings that aid in emulating low end hardware.
2022-11-29 09:15:02 -06:00
d01f7afff2
SL-18713 fix crash in handleCompositionMessage ( #12 )
2022-11-25 18:16:31 +02:00
d5298ac971
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolmaterials.cpp
# indra/newview/llpanelface.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-20 23:13:06 +01:00
e2d1af5c4f
SL-18154 Profile guided optimizations -- remove some unneeded operations and make LLDrawPoolMaterials less branchy.
2022-11-17 13:35:39 -06:00
a6ce12ab2b
Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer
2022-11-11 13:27:28 +01:00
a53ccb2379
SL-18136 fix for Japanese IME
2022-11-02 19:38:01 +02:00
a9128731c0
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llpanelface.cpp
# indra/newview/llpreview.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/en/panel_tools_texture.xml
2022-11-01 15:10:11 +01:00
800044fb33
Merged in SL-17005_cosmic_win8 (pull request #1106 )
...
SL-17005: Clean up debug code
2022-10-26 20:16:55 +00:00
24fb2f8336
Merge branch 'master' (DRTVWR-548) into DRTVWR-559
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-10-21 18:19:27 +03:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
52ce4adb0c
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
2022-10-19 11:40:51 +02:00
ec5009d70e
SL-18190 Potential fix for sapping CPU when "sleeping"
2022-10-13 19:51:40 -05:00
5763aa32cc
Merge branch 'DRTVWR-559' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/newview/llreflectionmapmanager.cpp
# indra/newview/llsettingsvo.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
2022-10-12 16:25:18 +02:00
9448db5d4a
SL-18190 Water shader WIP. Better parallax correction for sphere probes. Reduce probe memory footprint. Remove framebuffer copies and move to deprecate stencil buffer usage.
2022-10-06 18:40:01 -05:00
59ed674600
Use corrected VRAM budget for target VRAM calculation
2022-09-17 13:37:31 +02:00
3f145c0c3f
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-563
...
# Conflicts:
# indra/llcommon/llframetimer.cpp
# indra/llcommon/llprofiler.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_preferences_graphics1.xml
# indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
2022-08-30 22:17:59 +02:00
197ac7cc20
Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559
2022-08-30 10:46:36 -05:00
c100236f39
Merge branch 'DRTVWR-563' of https://bitbucket.org/lindenlab/viewer
2022-08-26 19:39:16 +02:00
bde0961297
Merge branch 'DRTVWR-563' of bitbucket.org:lindenlab/viewer into DRTVWR-563
2022-08-26 10:52:07 -05:00
Andrey Kleshchev