15d0525191
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-07-09 02:26:24 +02:00
75aa83aab6
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llmessage/lltemplatemessagedispatcher.cpp
# indra/newview/llappviewer.cpp
2024-07-06 12:42:19 +02:00
cabf0d60b9
FIRE-33958: Let's see if this fixes the stuck notifications by not removing toasts from the incorrect channel at startup
2024-07-06 04:14:10 +02:00
59312bf209
Introduce string_view to LLSD map functions to reduce string temporaries
2024-07-05 02:56:24 -04:00
3d9414c1f2
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfloaterreg.cpp
# indra/llui/llnotifications.cpp
# indra/llui/llpanel.cpp
# indra/llui/llui.cpp
# indra/llui/lluicolortable.cpp
# indra/llui/lluicolortable.h
# indra/newview/llappviewer.h
# indra/newview/llfloatersidepanelcontainer.cpp
# indra/newview/llfloatersidepanelcontainer.h
# indra/newview/llpanelpeoplemenus.cpp
# indra/newview/llviewermenufile.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/skins/default/xui/en/notifications.xml
2024-07-03 01:11:47 +02:00
fc8c601fc1
Reduce string temporaries from LLNotifications using string_view
2024-07-02 08:55:12 -04:00
b0e30477e9
Use heterogeneous comparison for string_view map finds in LLControl and convert controlExists to string_view
2024-07-01 22:25:56 -04:00
20294e9ee8
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
2024-07-02 01:23:35 +02:00
d77680e9f4
Maybe we need this... not sure, but probably going to be needed for LUA script support later anyway
2024-07-01 17:49:15 +02:00
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
b740bfb21c
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2024-06-07 10:47:15 +02:00
2a73551f8b
FIRE-33958 - Tentative fix for zombie notifications
...
I've only had limited success in reproducing this, so that fact I can't repro after fixing is not that compelling. However, when the issue occurs the underlying notification has been removed but the UI remains, this seems consistent with notification list being updated outside of the mutex guard and causing issues.
Note: LLNotifications has a number of methods that do an initial find and then call updateItem. I have not, at this point locked the higher livel calls as the updateItem call itself is locked and the higher level find is not likely to be problematic. If problems persist we can try guarding those too.
2024-06-04 01:26:59 +01:00
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
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
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
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
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
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
b527620dfc
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-04-24 19:53:03 +02:00
7a2070d795
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llvovolume.cpp
2024-04-24 18:59:46 +02:00
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
9b30bc68c1
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/fix-incredibuild.py
# indra/newview/app_settings/settings.xml
# indra/newview/llcontrolavatar.cpp
# indra/newview/lloutfitslist.cpp
2024-04-12 19:36:23 +02:00
f382180eb5
viewer#1069 Crash after getting list of notification files
2024-03-27 23:52:08 +02:00
77b6a6e978
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-03-27 15:32:45 +01:00
00163d131a
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 14:17:09 +01:00
990c8b81da
Merge branch 'main' into marchcat/yz-merge
2024-03-27 01:40:12 +02:00
71ed19839e
Merge branch 'main' into DRTVWR-600-maint-A
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterchangeitemthumbnail.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llvovolume.cpp
2024-03-27 00:45:06 +02:00
1f75fbd3b5
Merge branch 'main' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llrender/llrender.cpp
# indra/llui/lltransutil.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llviewerwindow.cpp
2024-03-26 22:43:42 +01:00
78ce375dda
SL-17896 Don't crash silently if files are missing or out of memory
...
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-03-05 00:29:35 +02:00
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
3ffe63b8a4
Convert remaining BOOLs in llxml and introduce std::string_view
2024-02-21 19:02:58 +02:00
314639426d
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llchat.h
# indra/llui/llcombobox.cpp
# indra/llui/llcontainerview.h
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.cpp
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmultifloater.cpp
# indra/llui/llmultifloater.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/llui/llspinctrl.cpp
# indra/llui/llspinctrl.h
# indra/llui/lltabcontainer.cpp
# indra/llui/lltabcontainer.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltexteditor.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llui/llview.h
# indra/llui/llviewereventrecorder.cpp
# indra/llxml/llcontrol.cpp
# indra/llxml/llcontrol.h
# indra/newview/llagentlanguage.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchicletbar.cpp
# indra/newview/llfloaterbuildoptions.cpp
# indra/newview/llfloaterbuildoptions.h
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llfloaterconversationpreview.h
# indra/newview/llfloaterdestinations.h
# indra/newview/llfloaterimagepreview.cpp
# indra/newview/llfloaterjoystick.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llfloaterpay.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterpreference.h
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterscriptdebug.cpp
# indra/newview/llfloaterscriptdebug.h
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llfloatersearch.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatertools.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llmediactrl.h
# indra/newview/llmoveview.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgroupnotices.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpanelmaininventory.h
# indra/newview/llpanelobject.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelpeople.h
# indra/newview/llpanelpermissions.h
# indra/newview/llpanelprofileclassifieds.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelsnapshot.h
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewnotecard.h
# indra/newview/llstartup.cpp
# indra/newview/llstatusbar.cpp
# indra/newview/llstatusbar.h
# indra/newview/llsyswellwindow.h
# indra/newview/lltexturectrl.h
# indra/newview/lltoolbarview.cpp
# indra/newview/lltoolselect.cpp
# indra/newview/llwearableitemslist.cpp
2024-02-21 13:07:42 +01:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
80579b7574
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-599
...
# Conflicts:
# indra/newview/llchiclet.h
2024-02-05 23:32:19 +01:00
e3e1672ac4
Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz
...
# Conflicts:
# indra/newview/llchiclet.h
2024-02-05 22:04:40 +02:00
45dc1a63f0
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
2024-01-12 14:18:34 +01:00
ba74152c82
Replace BOOST_FOREACH with standard C++ range-based for-loops
2024-01-09 20:44:50 +02:00
ab2675497b
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llimage/llimagebmp.cpp
# indra/llimage/llimagetga.cpp
# indra/llui/lltransutil.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llpanelprofile.cpp
2024-01-05 14:31:37 +01:00
51088cde7f
SL-17896 Don't crash silently if files are missing or out of memory
...
Under debug LL_ERRS will show a message as well, but release won't show
anything and will quit silently so show a notification when applicable.
2024-01-04 21:13:06 +02:00
e341621a8e
Merge branch 'DRTVWR-594-maint-Y' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llmemory.cpp
# indra/llui/lltooltip.cpp
# indra/newview/llagent.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/notifications.xml
2023-12-27 13:00:20 +01:00
6b3dd7929b
SL-17076 Thread safety of LLNotificationChannelBase's items
...
Due to odd crashes when cleaning mItems adding thread safety
Viewer runs window in a separate thread, it is possible notification
was added in a way that corrupted the list.
2023-11-24 15:15:10 +02:00
dce1fae986
SL-17076 MacOS crash on clearing ChicletNotificationChannel
...
Crash appears to happens inside mItems.clear() of the
LLNotificationChannelBase, but there is no apparent reson for it and
stack jumped some steps, so I'm doing cleanup more explicitly to see
if it's indeed there and not a corruption somewhere earlier.
2023-11-24 15:15:10 +02:00
866e71d1f8
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lltoastalertpanel.cpp
# indra/newview/skins/default/xui/en/floater_preview_gesture.xml
# indra/newview/skins/default/xui/en/panel_group_general.xml
# indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-10-21 13:52:40 +02:00
ddb2c93818
SL-20463 Rename outfit dialog box accepts emoji characters
2023-10-18 13:32:39 +02:00
6ae8248f5d
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llinventory/llsettingssky.cpp
# indra/llui/llfolderviewitem.h
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/xui/de/floater_about_land.xml
# indra/newview/skins/default/xui/de/floater_avatar_textures.xml
# indra/newview/skins/default/xui/de/floater_camera.xml
# indra/newview/skins/default/xui/de/floater_camera_presets.xml
# indra/newview/skins/default/xui/de/floater_linkreplace.xml
# indra/newview/skins/default/xui/de/floater_people.xml
# indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/de/floater_preview_trash.xml
# indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/de/notifications.xml
# indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/de/panel_group_roles.xml
# indra/newview/skins/default/xui/de/panel_login.xml
# indra/newview/skins/default/xui/de/panel_notification_list_item.xml
# indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/de/panel_preferences_sound.xml
# indra/newview/skins/default/xui/de/panel_progress.xml
# indra/newview/skins/default/xui/de/panel_region_environment.xml
# indra/newview/skins/default/xui/de/strings.xml
# indra/newview/skins/default/xui/de/teleport_strings.xml
# indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
# indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/es/floater_camera.xml
# indra/newview/skins/default/xui/es/floater_god_tools.xml
# indra/newview/skins/default/xui/es/floater_people.xml
# indra/newview/skins/default/xui/es/floater_tools.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/es/notifications.xml
# indra/newview/skins/default/xui/es/panel_group_roles.xml
# indra/newview/skins/default/xui/es/panel_landmark_info.xml
# indra/newview/skins/default/xui/es/panel_login.xml
# indra/newview/skins/default/xui/es/panel_preferences_sound.xml
# indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/es/strings.xml
# indra/newview/skins/default/xui/es/teleport_strings.xml
# indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
# indra/newview/skins/default/xui/fr/floater_camera.xml
# indra/newview/skins/default/xui/fr/floater_camera_presets.xml
# indra/newview/skins/default/xui/fr/floater_forget_user.xml
# indra/newview/skins/default/xui/fr/floater_linkreplace.xml
# indra/newview/skins/default/xui/fr/floater_people.xml
# indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/fr/floater_preview_trash.xml
# indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
# indra/newview/skins/default/xui/fr/menu_viewer.xml
# indra/newview/skins/default/xui/fr/notifications.xml
# indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/fr/panel_group_roles.xml
# indra/newview/skins/default/xui/fr/panel_login.xml
# indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
# indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
# indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/fr/panel_progress.xml
# indra/newview/skins/default/xui/fr/panel_region_environment.xml
# indra/newview/skins/default/xui/fr/strings.xml
# indra/newview/skins/default/xui/fr/teleport_strings.xml
# indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/it/floater_avatar_textures.xml
# indra/newview/skins/default/xui/it/floater_camera.xml
# indra/newview/skins/default/xui/it/floater_camera_presets.xml
# indra/newview/skins/default/xui/it/floater_god_tools.xml
# indra/newview/skins/default/xui/it/floater_media_browser.xml
# indra/newview/skins/default/xui/it/floater_people.xml
# indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/it/floater_stats.xml
# indra/newview/skins/default/xui/it/menu_login.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/it/notifications.xml
# indra/newview/skins/default/xui/it/panel_group_roles.xml
# indra/newview/skins/default/xui/it/panel_landmark_info.xml
# indra/newview/skins/default/xui/it/panel_login.xml
# indra/newview/skins/default/xui/it/panel_notifications_channel.xml
# indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/it/panel_place_profile.xml
# indra/newview/skins/default/xui/it/panel_preferences_sound.xml
# indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
# indra/newview/skins/default/xui/it/panel_region_environment.xml
# indra/newview/skins/default/xui/it/sidepanel_appearance.xml
# indra/newview/skins/default/xui/it/strings.xml
# indra/newview/skins/default/xui/it/teleport_strings.xml
# indra/newview/skins/default/xui/ja/floater_camera.xml
# indra/newview/skins/default/xui/ja/floater_camera_presets.xml
# indra/newview/skins/default/xui/ja/floater_people.xml
# indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
# indra/newview/skins/default/xui/ja/notifications.xml
# indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/ja/panel_group_roles.xml
# indra/newview/skins/default/xui/ja/panel_login.xml
# indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
# indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
# indra/newview/skins/default/xui/ja/panel_region_environment.xml
# indra/newview/skins/default/xui/ja/strings.xml
# indra/newview/skins/default/xui/ja/teleport_strings.xml
# indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
# indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
# indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
# indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
# indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/pl/panel_profile_pick.xml
# indra/newview/skins/default/xui/pl/panel_profile_picks.xml
# indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
# indra/newview/skins/default/xui/pl/panel_region_access.xml
# indra/newview/skins/default/xui/pl/panel_script_experience.xml
# indra/newview/skins/default/xui/pt/notifications.xml
# indra/newview/skins/default/xui/pt/panel_group_roles.xml
# indra/newview/skins/default/xui/pt/panel_landmark_info.xml
# indra/newview/skins/default/xui/pt/panel_login.xml
# indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
# indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
f3cd329b58
SL-18911 My Land Holdings floater crashes viewer on the Xcode/+Monterey branches ( #47 )
...
Revert part of "DRTVWR-575: Address review comments on Xcode 14.1 type tweaks."
Crash was reproduced when assigning areastr to llsd, but likely present in other cases of assigning ui strings to llsd (instead of going for lluistring's result directly copy constructor was engaged and either copy or original crashed due to invalid pointers, copy shouldn't have been created).
2023-01-10 19:38:44 +02:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# 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 10:12:19 +01:00
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
Ansariel