summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2023-11-30Merge branch 'DRTVWR-588-maint-W' into marchcat/588-w-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llrender/llgl.cpp # indra/llrender/llvertexbuffer.cpp # indra/llui/llflatlistview.cpp # indra/newview/lldrawpoolground.cpp # indra/newview/llspatialpartition.cpp # indra/newview/lltexturefetch.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llviewertexture.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_stats.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml
2023-11-29Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-mergeAndrey Lihatskiy
# Conflicts: # indra/llcommon/CMakeLists.txt # indra/newview/llspatialpartition.cpp # indra/newview/llviewergenericmessage.cpp # indra/newview/llvoavatar.cpp
2023-11-23SL-17434 Crash clearing LLEventPumpsAndrey Kleshchev
We actively use event pumps's connections in threads, make sure nothing modifies list of connections during reset. And in case this doesn't fix the issue list affected pump before it crashes to have a better idea of what is going on.
2023-11-20SL-20550 Infinite loop test crashes intantly on MacOS.Andrey Kleshchev
2023-11-06Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-11-05Require SSE2 only on x86Erik Kundiman
2023-10-26Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-26Merge tag '6.6.16-release'Erik Kundiman
source for viewer 6.6.16.6566955269
2023-10-25Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-10-25Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorygallery.cpp
2023-10-25Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # autobuild.xml
2023-10-25Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/tests/llleap_test.cpp # indra/newview/viewer_manifest.py
2023-10-17SL-18837: Avoid stuffing build number into 32-bit int.Nat Goodspeed
Even though LLVersionInfo::getBuild() already returns a 64-bit int, various consumers assumed it could fit into 32 bits. It was especially bad to pass it to a classic C style varargs function. Only on a little-endian CPU, and only because it was the last argument, the damage was limited to truncation -- instead of arbitrary undefined behavior. Where the consumer doesn't support 64-bit ints, pass as string instead.
2023-10-16Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-10-14Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-10-14Not build libvlc on macOS for nowErik Kundiman
At runtime it hasn't worked anyway. And now we can get an ARM build without having to build libvlc for ARM first.
2023-10-13Merge branch 'DRTVWR-559' into DRTVWR-592Cosmic Linden
2023-10-13DRTVWR-592: Add debug options LocalTerrainAssetN. Fix PBR terrain texture ↵Cosmic Linden
flickering
2023-10-04SL-18837: Merge branch 'main' of secondlife/viewer into actionsNat Goodspeed
2023-10-04Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-10-04Merge tag '6.6.15-release'Erik Kundiman
source for viewer 6.6.15.581961
2023-10-03Merge branch 'main' into DRTVWR-591-maint-XAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventorybridge.cpp # indra/newview/lltexturectrl.h # indra/newview/llvovolume.cpp
2023-10-03Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
# Conflicts: # indra/llui/lltooltip.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/textures/textures.xml
2023-10-03Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorymodel.cpp # indra/newview/llvovolume.cpp
2023-10-03Merge branch 'main' (DRTVWR-567) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/VIEWER_VERSION.txt # indra/newview/llagent.cpp # indra/newview/llfloaternewfeaturenotification.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorymodel.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelmaininventory.h # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsidepaneltaskinfo.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/llviewerinventory.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llviewertexturelist.h # indra/newview/skins/default/xui/en/floater_new_feature_notification.xml # indra/newview/skins/default/xui/en/menu_inventory.xml
2023-09-25Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-23Merge remote-tracking branch 'secondlife/DRTVWR-559' into DRTVWR-559Erik Kundiman
2023-09-22SL-15039 Prune unused preferences #2Andrey Kleshchev
List of removed preferences (usused per statistics): BottomPanelNew BrowserHomePage BlockSomeAvatarAppearanceVisualParams ButtonHPad ButtonHeight ButtonHeightSmall CacheNumberOfRegionsForObjects ChatBarStealsFocus ChatLoadGroupTimeout ChatPersistTime ChatShowTimestamps ContextConeInAlpha ContextConeOutAlpha ContextConeFadeTime ConversationHistoryPageSize ContactsTornOff CurlMaximumNumberOfHandles CurlUseMultipleThreads CustomServer DebugShowPrivateMem
2023-09-19Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-19Disable assembly instructions on non x86Erik Kundiman
at least for now.
2023-09-11Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into davep/SL-19842RunitaiLinden
2023-09-11Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-11Revive HiDPI support & multi threaded OpenGLErik Kundiman
See 7dd1149e3649057f0962b85bdc467f4e9299b235. The attributes only needed to be moved from LLWindowMacOS X to LLWindowSDL.
2023-09-10Merge branch 'main' into DRTVWR-559Erik Kundiman
2023-09-09Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-09-07SL-18837: Merge branch 'main' into actionsNat Goodspeed
2023-09-01SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended infoAlexander Gavriliuk
2023-09-01SL-19664 Crash in LLAppViewer::initStrings(2985) - log extended infoAlexander Gavriliuk
2023-09-01SL-19664 Crash in LLAppViewer::initStrings - make the error message more ↵Alexander Gavriliuk
informative
2023-08-30SL-19664 Crash in LLAppViewer::initStrings - make the error message more ↵Alexander Gavriliuk
informative
2023-08-29SL-20229 Add GenericStreamingMessage and use it to receive GLTF material ↵RunitaiLinden
overrides
2023-08-29Merge branch 'DRTVWR-559' into DRTVWR-583Jonathan "Geenz" Goodman
2023-08-24Merge tag '6.6.14-release'Erik Kundiman
source for viewer 6.6.14.581101
2023-08-23Merge branch main (DRTVWR-582) into DRTVWR-567Andrey Kleshchev
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventoryfunctions.h # indra/newview/llinventorymodel.cpp # indra/newview/llinventoryobserver.cpp # indra/newview/llinventoryobserver.h # indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23Merge branch 'main' into DRTVWR-588-maint-WAndrey Lihatskiy
2023-08-23Merge branch 'main' into DRTVWR-587-maint-VAndrey Lihatskiy
# Conflicts: # autobuild.xml
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-08-21Darwin not (directly) relying on Carbon & Obj-CErik Kundiman
HiDPI support & multi threaded OpenGL haven't been used since we switched to SDL2 on Darwin, and so far there hasn't been any sign that things aren't working any more significantly.
2023-08-18Latest updates to the hero probe manager.Jonathan "Geenz" Goodman
DRTVWR-583
2023-08-03SL-18049 Part 1; Allow voice to be enabled in second instanceAndrey Kleshchev
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-02 11:57:47 +0000