568 Commits (2a6b5cbde5ec3c3603b9cd3aecd5e6eac06eb1fc)

Author	SHA1	Message	Date
Ansariel	98a48cf1c1	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/pipeline.cpp	2025-10-11 14:35:54 +02:00
Andrey Kleshchev	49caa5e179	#4758 Extra logging to track discard 6 ... Plus clamped some values and preventing decode from starting # Conflicts: # indra/newview/llviewertexture.cpp	2025-10-02 01:33:20 +10:00
Ansariel	950fa11bcb	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llfloatersearch.cpp # indra/newview/llstatusbar.cpp # indra/newview/lltextureview.cpp # indra/newview/llviewerwindow.cpp # indra/newview/skins/default/xui/en/floater_search.xml	2025-08-25 11:26:30 +02:00
Andrey Kleshchev	1022be6986	#4570 Sanity check bandwidth input ... Going above this will just make server throttle things and viewer's own throttlig won't be effective when viewer can't keep up.	2025-08-22 23:15:24 +03:00
Ansariel	4c355879cc	Merge branch 'release/2025.05' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llui/llfolderviewitem.h # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/newview/app_settings/settings.xml # indra/newview/llagent.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloatermodelpreview.h # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfilter.cpp # indra/newview/llinventoryfilter.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelmaininventory.cpp # indra/newview/llpaneloutfitedit.cpp # indra/newview/llpaneloutfitsinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelpermissions.h # indra/newview/llpanelwearing.cpp # indra/newview/llpanelwearing.h # indra/newview/llselectmgr.h # indra/newview/llskinningutil.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/llviewerattachmenu.cpp # indra/newview/llviewerinventory.cpp # indra/newview/llviewerinventory.h # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llwearableitemslist.cpp # indra/newview/skins/default/textures/textures.xml # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/floater_object_weights.xml # indra/newview/skins/default/xui/en/menu_gallery_outfit_tab.xml # indra/newview/skins/default/xui/en/menu_inventory.xml # indra/newview/skins/default/xui/en/menu_outfit_tab.xml # indra/newview/skins/default/xui/en/menu_wearing_tab.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_main_inventory.xml # indra/newview/skins/default/xui/en/panel_outfit_gallery.xml # indra/newview/skins/default/xui/en/panel_outfits_list.xml # indra/newview/skins/default/xui/en/panel_outfits_wearing.xml # indra/newview/skins/default/xui/en/panel_places.xml # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml # indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/en/sidepanel_appearance.xml # indra/newview/skins/default/xui/en/strings.xml # indra/newview/skins/default/xui/ja/panel_settings_sky_sunmoon.xml # indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml	2025-04-16 17:49:47 +02:00
Andrey Lihatskiy	5d7a5001b4	Merge commit '9e24b30' into marchcat/maint-c/restore ... # Conflicts: # indra/llmath/v2math.cpp # indra/llmath/v2math.h # indra/llmath/v3math.h # indra/llmath/v4math.h # indra/llui/llfolderviewitem.cpp # indra/llui/llfolderviewitem.h # indra/llui/llfolderviewmodel.h # indra/llui/llmodaldialog.cpp # indra/llui/lltexteditor.cpp # indra/llui/lltexteditor.h # indra/llwindow/llwindowwin32.cpp # indra/newview/llagent.cpp # indra/newview/llagentcamera.h # indra/newview/llavatarrenderinfoaccountant.cpp # indra/newview/llconversationmodel.h # indra/newview/llfloaterinventorysettings.cpp # indra/newview/llfloaternamedesc.cpp # indra/newview/llfloaternamedesc.h # indra/newview/llfloaterobjectweights.cpp # indra/newview/llfloaterobjectweights.h # indra/newview/llfolderviewmodelinventory.h # indra/newview/llinspecttexture.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorygallery.h # indra/newview/llinventorygallerymenu.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmaterialeditor.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitgallery.h # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpanelgroupcreate.cpp # indra/newview/llpanelgroupgeneral.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpaneloutfitsinventory.h # indra/newview/llpanelprofile.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llselectmgr.cpp # indra/newview/llsidepanelappearance.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llteleporthistorystorage.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltexturectrl.h # indra/newview/lltexturefetch.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerassetupload.cpp # indra/newview/llviewercamera.cpp # indra/newview/llviewercamera.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewerobject.h # indra/newview/llviewertexture.cpp # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/tests/llviewerassetstats_test.cpp	2025-04-10 06:01:50 +03:00
Ansariel	5bf1f485f3	Merge branch 'release/2024.12-ForeverFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llqueuedthread.cpp	2025-02-13 21:24:29 +01:00
Andrey Lihatskiy	ddbe1ff981	Fix xcode16 build errors	2025-02-13 17:30:08 +02:00
Beq	461c6f5efe	minor Tracy classification updates	2024-12-28 18:49:54 +00:00
Ansariel	215c2d2de0	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer	2024-12-05 23:26:47 +01:00
Dave Parks	1120a7ccb9	#3210 Fix for "Texture will be downscaled" happening too often. (#3212)	2024-12-05 13:52:03 -06:00
Ansariel	7c3b74a0df	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llviewertexture.cpp # indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml	2024-12-04 16:11:44 +01:00
Andrey Kleshchev	9cc343b5eb	#3093 #3055 World Map tiles are blurry #2	2024-12-03 23:33:28 +02:00
Ansariel	68d82c9793	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llrender/llvertexbuffer.cpp # indra/newview/app_settings/settings.xml # indra/newview/lltexturefetch.cpp # indra/newview/viewer_manifest.py	2024-11-27 19:23:33 +01:00
Andrey Kleshchev	79fe883ab6	viewer#3147 Thumbnail picker's image is grey #2 ... Apparently made a blunder in previous commit since I missed mFetchState being reset each run	2024-11-27 18:29:46 +02:00
Ansariel	812d46c351	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llprimitive/lldaeloader.cpp # indra/newview/llvotree.cpp	2024-11-22 18:01:53 +01:00
Andrey Kleshchev	3db8ce9846	viewer#3123 Crash at LLVOTree::updateSpatialExtents	2024-11-22 15:38:53 +02:00
Ansariel	b1a253e26c	Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/skins/default/xui/en/menu_viewer.xml	2024-10-16 19:14:13 +02:00
Andrey Kleshchev	86f7e0d75e	viewer#2850 Fix a crash in LLTextureFetchWorker ... cache worker does not respond in case it was aborted, leaving behind a handle.	2024-10-15 15:34:25 +03:00
Ansariel	80f9aaa46e	Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/Audio.cmake # indra/llui/llconsole.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterscriptedprefs.cpp # indra/newview/llhudnametag.cpp # indra/newview/llhudtext.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llscripteditor.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltextureview.cpp # indra/newview/llviewerchat.cpp # indra/newview/llviewerchat.h # indra/newview/llviewermenu.cpp # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewerparceloverlay.h # indra/newview/llviewerwindow.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvosurfacepatch.cpp	2024-08-05 20:10:02 +02:00
Andrey Kleshchev	7144fb2359	Remove remainder of unused packet data code from LLTextureFetch ... Downloading packets from server was removed in favor of HTTP	2024-08-05 15:57:48 +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	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
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
Ansariel	0ecfbc3de9	Merge remote-tracking branch 'LGPL/master' ... # Conflicts: # autobuild.xml # indra/cmake/CMakeLists.txt # indra/cmake/GoogleMock.cmake # indra/llappearance/llwearable.cpp # indra/llcharacter/llmultigesture.cpp # indra/llcharacter/llmultigesture.h # indra/llimage/llimage.cpp # indra/llimage/llimagepng.cpp # indra/llimage/llimageworker.cpp # indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp # indra/newview/llimpanel.cpp # 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/llpaneleditwearable.cpp # indra/newview/llpanelobjectinventory.cpp # indra/newview/llpanelprofile.cpp # 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/llviewermenu.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/macmain.h	2024-05-16 14:10:55 +02:00
Andrey Lihatskiy	e592164436	Merge branch 'main' into release/maint-c ... # Conflicts: # indra/llui/lltexteditor.cpp # indra/newview/llcontrolavatar.cpp	2024-05-15 12:27:46 +03:00
Andrey Lihatskiy	dcb85f9f9d	Merge branch 'marchcat/w-whitespace' into release/maint-c	2024-05-15 12:07:29 +03:00
Ansariel	5f1a19af72	Merge remote-tracking branch 'LL/marchcat/x-ws-merge' ... # Conflicts: # autobuild.xml # indra/linux_crash_logger/llcrashloggerlinux.cpp # indra/newview/llappviewerlinux_api.h # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerlinux_api_dbus.h # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llcallbacklist.cpp # indra/newview/llimpanel.h	2024-05-01 12:30:57 +02:00
Andrey Lihatskiy	38c2a5bde9	Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge	2024-05-01 08:16:58 +03: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
Andrey Kleshchev	f660f1f0fd	viewer#1260 Fix thumbnail preview not loading ... Standard and scaled textures couldn't share workers and if one finished a request, second one failed to start a new one.	2024-04-18 23:00:43 +03:00
Ansariel	7355b798d2	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # autobuild.xml # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/llpaneleditwearable.cpp # indra/newview/lltexturefetch.cpp	2024-04-12 19:33:20 +02:00
Andrey Lihatskiy	eab5beb54c	Merge branch 'main' into marchcat/x-merge ... # Conflicts: # indra/llimage/llimageworker.cpp # indra/llimage/llimageworker.h # indra/newview/llcontrolavatar.cpp # indra/newview/llfloaterprofiletexture.cpp # indra/newview/lloutfitslist.cpp # indra/newview/lloutfitslist.h # indra/newview/lltexturefetch.cpp	2024-04-12 15:43:34 +03:00
Ansariel	d0102af56d	Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A ... # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llselectmgr.cpp # indra/newview/lltranslate.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp	2024-04-11 21:59:38 +02:00
Ansariel	0dd4b94ef0	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llcommon/llpointer.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llscrollingpanelparam.cpp # indra/newview/llselectmgr.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/en/panel_performance_complexity.xml # indra/newview/skins/default/xui/en/panel_performance_huds.xml	2024-04-10 12:32:32 +02:00
Ansariel	5c93f37775	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llrender/llrender.cpp # indra/newview/llreflectionmap.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewerwindow.cpp	2024-03-05 03:31:18 +01:00
Ansariel	b71c7f37ea	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/newview/llagent.cpp # indra/newview/llagent.h # indra/newview/llagentcamera.cpp # indra/newview/llagentcamera.h # indra/newview/llappviewer.cpp # indra/newview/llappviewerlinux_api_dbus.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llattachmentsmgr.cpp # indra/newview/llattachmentsmgr.h # indra/newview/llavataractions.cpp # indra/newview/llcallingcard.cpp # indra/newview/llcompilequeue.cpp # indra/newview/llcontrolavatar.h # indra/newview/lldirpicker.cpp # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolalpha.h # indra/newview/lldrawpoolavatar.h # indra/newview/lldynamictexture.cpp # indra/newview/llfasttimerview.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfilepicker.cpp # indra/newview/llfloateravatarpicker.cpp # indra/newview/llfloaterbeacons.cpp # indra/newview/llfloaterbvhpreview.cpp # indra/newview/llfloatercamera.cpp # indra/newview/llfloaterchangeitemthumbnail.cpp # indra/newview/llfloaterdisplayname.cpp # indra/newview/llfloatergotoline.cpp # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloaterland.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterpreferencesgraphicsadvanced.cpp # indra/newview/llfloaterscriptdebug.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersnapshot.cpp # indra/newview/llfloatertools.cpp # indra/newview/llfloatertools.h # indra/newview/llfloateruipreview.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llgesturemgr.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llglsandbox.cpp # indra/newview/llgroupactions.cpp # indra/newview/llhudeffectlookat.cpp # indra/newview/llhudeffectlookat.h # indra/newview/llhudicon.cpp # indra/newview/llhudmanager.cpp # indra/newview/llhudtext.cpp # indra/newview/llhudtext.h # indra/newview/llimprocessing.cpp # indra/newview/llimview.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llinventorybridge.h # indra/newview/llinventoryfunctions.cpp # indra/newview/llinventorymodel.cpp # indra/newview/llinventorymodel.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/lllocalbitmaps.cpp # indra/newview/lllogininstance.cpp # indra/newview/llmaniptranslate.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llmodelpreview.h # indra/newview/llmutelist.cpp # indra/newview/llnavigationbar.cpp # indra/newview/llnavigationbar.h # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h # indra/newview/llnotificationlistitem.cpp # indra/newview/lloutputmonitorctrl.cpp # indra/newview/llpanelcontents.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelexperiencepicker.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelgroup.cpp # indra/newview/llpanelgroupnotices.cpp # indra/newview/llpanelgrouproles.cpp # indra/newview/llpanellandaudio.cpp # indra/newview/llpanellandmarks.cpp # indra/newview/llpanelmaininventory.cpp # indra/newview/llpanelobject.cpp # indra/newview/llpanelobject.h # indra/newview/llpanelpeople.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelplaces.cpp # indra/newview/llpanelpresetspulldown.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelsnapshot.h # indra/newview/llpanelvolume.cpp # indra/newview/llpanelwearing.cpp # indra/newview/llpreviewanim.cpp # indra/newview/llpreviewgesture.cpp # indra/newview/llpreviewnotecard.cpp # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llpreviewtexture.cpp # indra/newview/llpreviewtexture.h # indra/newview/llselectmgr.cpp # indra/newview/llsidepaneliteminfo.cpp # indra/newview/llsidepaneltaskinfo.cpp # indra/newview/llsnapshotlivepreview.cpp # indra/newview/llstartup.cpp # indra/newview/llstatusbar.cpp # indra/newview/llsurface.h # indra/newview/llsurfacepatch.cpp # indra/newview/lltexturecache.h # indra/newview/lltexturectrl.cpp # indra/newview/lltexturefetch.cpp # indra/newview/lltoastimpanel.cpp # indra/newview/lltoolbarview.cpp # indra/newview/lltooldraganddrop.cpp # indra/newview/lltoolface.cpp # indra/newview/lltoolfocus.cpp # indra/newview/lltoolgrab.cpp # indra/newview/lltoolgun.cpp # indra/newview/lltoolgun.h # indra/newview/lltoolpie.cpp # indra/newview/lltoolplacer.cpp # indra/newview/lltoolselect.cpp # indra/newview/lluploaddialog.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llvieweraudio.cpp # indra/newview/llviewerdisplay.cpp # indra/newview/llviewerfoldertype.cpp # indra/newview/llviewerinput.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewermenu.h # indra/newview/llviewermenufile.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewerobject.cpp # indra/newview/llviewerobject.h # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewerobjectlist.h # indra/newview/llviewerparcelmgr.cpp # indra/newview/llviewerparceloverlay.cpp # indra/newview/llviewerregion.cpp # indra/newview/llviewerregion.h # indra/newview/llviewershadermgr.cpp # indra/newview/llviewertexlayer.cpp # indra/newview/llviewertexlayer.h # indra/newview/llviewertexture.cpp # indra/newview/llviewertexture.h # indra/newview/llviewertexturelist.h # indra/newview/llviewerwindow.cpp # indra/newview/llviewerwindow.h # indra/newview/llvoavatar.cpp # indra/newview/llvoavatar.h # indra/newview/llvoavatarself.cpp # indra/newview/llvoavatarself.h # indra/newview/llvoiceclient.h # indra/newview/llvosky.cpp # indra/newview/llvosurfacepatch.cpp # indra/newview/llvotree.cpp # indra/newview/llvovolume.cpp # indra/newview/llvovolume.h # indra/newview/llvowater.cpp # indra/newview/llworld.cpp # indra/newview/llworldmapview.cpp # indra/newview/llworldmipmap.cpp # indra/newview/pipeline.cpp	2024-02-22 11:43:04 +01:00
Ansariel	60d3dd98a4	Convert remaining BOOL to bool	2024-02-21 23:14:31 +02:00
Ansariel	a831237e29	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llimage/llimage.cpp # indra/llimage/llimage.h # indra/llkdu/llimagej2ckdu.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfavoritesbar.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/llfloaterpreference.h # scripts/messages/message_template.msg.sha1	2024-02-06 17:58:20 +01:00
Ansariel	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
Andrey Kleshchev	da48bd9439	SL-18721 Shutdown fixes #2 ... Set DONE if decode thread is down instead of waiting for an update. Decodes can't be canceled, so fix potential situation where we get two responses	2024-01-23 13:01:39 +02:00
Andrey Kleshchev	305fe845c6	SL-20779 More reliable decode and encode error logging (#615)	2024-01-09 23:16:57 +02:00
Alexander Gavriliuk	74c8b028d4	SL-20743 Use LLMutex in LLImageBase for internal data thread-safety	2023-12-21 19:12:52 +01:00
Ansariel	6c389316f1	Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llrender/llrender.h # indra/newview/VIEWER_VERSION.txt	2023-10-27 13:00:41 +02:00
RunitaiLinden	1fe76ad0b9	SL-20149 Potential fix for crash when unsitting on a reflection probe. Also fix for assertion in lltexturefetch.	2023-10-18 14:54:07 -05:00