Ansariel
|
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 |
|
Ansariel
|
9a2b83b294
|
Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/llmessage/CMakeLists.txt
# indra/llmessage/llfiltersd2xmlrpc.cpp
# indra/newview/lldebugview.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llslurl.cpp
# indra/newview/llsurface.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llworld.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
# scripts/messages/message_template.msg.sha1
|
2024-07-02 18:08:57 +02:00 |
|
Rye Mutt
|
3fa6db9603
|
Reduce string temporaries from LLTrans
|
2024-07-01 22:50:39 -04:00 |
|
Alexander Gavriliuk
|
2ea5ac0c43
|
#1111 Remove xmlrpc-epi
|
2024-07-01 20:20:04 +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 |
|
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
|
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 |
|
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
|
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 |
|
Ansariel
|
8c16ec2b53
|
Convert BOOL to bool in LLControlGroup and related classes
|
2024-02-21 03:00:25 +02:00 |
|
Ansariel
|
e14473f2c7
|
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llinventoryobserver.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/strings.xml
|
2023-09-20 12:52:23 +02:00 |
|
Andrey Kleshchev
|
69a98a8465
|
SL-20278 Disconnect saving MFA from saving password
|
2023-09-15 03:07:29 +03:00 |
|
Brad Kittenbrink
|
9d7b63b681
|
Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer both reasons at the same time
|
2022-11-01 13:34:50 +01:00 |
|
Brad Kittenbrink
|
52b64bcfd7
|
Fix SL-18511 TOS and MFA login failure handlers must cooperate to answer both reasons at the same time
|
2022-10-31 14:17:05 -07:00 |
|
Ansariel
|
3a4a0bd3d2
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2022-06-29 17:25:32 +02:00 |
|
Andrey Kleshchev
|
2efd6727c1
|
SL-17546 Fix 'release' configuration build tests
|
2022-06-08 19:47:37 +03:00 |
|
Andrey Kleshchev
|
314d086814
|
SL-17546 Do not launch updater for a non-interactible instance
|
2022-06-07 22:21:07 +03:00 |
|
Ansariel
|
c3062e0e82
|
Merge branch 'DRTVWR-550-mfa' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
# indra/viewer_components/login/lllogin.cpp
|
2022-04-20 17:20:53 +02:00 |
|
Ansariel
|
717c31b77f
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2022-04-20 17:18:46 +02:00 |
|
Ansariel
|
ad0aa3422f
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
|
2022-04-19 00:23:41 +02:00 |
|
Brad Kittenbrink
|
e9921e77b0
|
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
|
2022-04-18 13:29:25 -07:00 |
|
Andrey Kleshchev
|
3feb92046f
|
SL-16831 Viewer stalls for 10 seconds before displaying a login failure
# Conflicts:
# indra/newview/llstartup.cpp
|
2022-03-29 16:22:11 +03:00 |
|
Ansariel
|
c6dcde09bc
|
Build fix
|
2022-03-25 10:04:00 +01:00 |
|
Ansariel
|
a637e255f3
|
Merge branch 'DRTVWR-550-mfa' of https://bitbucket.org/lindenlab/viewer
|
2022-03-25 09:20:10 +01:00 |
|
Brad Kittenbrink
|
22a22d17b4
|
Fix SL-17034/BUG-231938 whitespace in token causes authentication failure
|
2022-03-18 15:22:29 -07:00 |
|
Brad Kittenbrink
|
6bdd744d78
|
SL-17019 mfa_hash should get saved per-username
|
2022-03-17 13:29:12 -07:00 |
|
Brad Kittenbrink
|
9d1891aff1
|
SL-16888 debug setting MFAHash value now gets saved to mfa_hash secure storage as well.
|
2022-03-09 08:29:56 -08:00 |
|
Andrey Kleshchev
|
a09686bf54
|
SL-16953 Deprecated NoInventoryLibrary
Due to changes in SL-16715
|
2022-03-01 21:40:12 +02:00 |
|
Brad Kittenbrink
|
8422183958
|
Related to fix for SL-16792, standardize on naming the filed simply mfa_hash end-to-end to avoid confusion
|
2022-02-04 14:28:07 -08:00 |
|
Brad Kittenbrink
|
990bee7ee2
|
SL-16654 simplify MFA token prompt UI to use notifications instead of new custom floater.
|
2022-01-14 22:56:26 -08:00 |
|
Brad Kittenbrink
|
96a6d21086
|
SL-16514 store mfa hash in protected data using LLSecAPIBasicHandler
|
2022-01-14 22:24:52 -08:00 |
|
Brad Kittenbrink
|
b74dc0e27a
|
SL-16388 Viewer MFA fix Duplicate Listener crash when first token challenge failed
also cleaned up some xui warnings
|
2021-12-14 09:07:09 -08:00 |
|
Brad Kittenbrink
|
6d177898a9
|
SL-16501 SLMFAHash is now saved client side
|
2021-12-13 14:58:38 -08:00 |
|
Brad Kittenbrink
|
30cd108c7e
|
SL-16388 Viewer MFA Implementation Improvements
token input is now handled and message formatting is improved.
Added beginnings of support for saving slmfa_hash value client side.
|
2021-12-06 16:17:55 -08:00 |
|
Brad Kittenbrink
|
d307843dd4
|
SL-16388 Viewer MFA Implementation
We now present MFA errors to the user during login and prompt them for
an authentication token.
|
2021-11-23 17:45:22 -08:00 |
|
Brad Kittenbrink
|
a1fb89ebb6
|
SL-16365 Viewer adds empty mfa token to login params
|
2021-11-23 17:44:06 -08:00 |
|
Ansariel
|
098f79d7b6
|
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
|
2021-02-15 11:42:22 +01:00 |
|
Andrey Kleshchev
|
af7554a835
|
SL-11215 Release notes url should be an url
|
2021-02-10 22:40:40 +02:00 |
|
Ansariel
|
7458601374
|
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
|
2021-02-02 00:05:53 +01:00 |
|
Andrey Kleshchev
|
609a26b59a
|
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
|
2021-02-01 22:28:15 +02:00 |
|
Ansariel
|
09bcd7ac67
|
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-11-23 19:27:33 +01:00 |
|
Mnikolenko Productengine
|
d55d37c165
|
SL-14386 FIXED Crash: LLLoginInstance::~LLLoginInstance()
|
2020-11-23 18:24:44 +02:00 |
|
Ansariel
|
3b630f2cda
|
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-11-12 17:06:16 +01:00 |
|
Andrey Kleshchev
|
3310fa573f
|
Reapplied SL-11215: Add release notes URLs to update-related notifications.
In scope of SL-13740 work, this reverts commit 1935d25c78.
|
2020-11-06 19:14:47 +02:00 |
|
Ansariel
|
b4635cc30d
|
Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer
|
2020-08-11 19:19:00 +02:00 |
|
Andrey Kleshchev
|
1935d25c78
|
Revert "SL-11215: Add release notes URLs to update-related notifications."
This reverts commit bf999f2f84 due to revert of updater, this will be moved to separate 'epic' instead
|
2020-08-06 20:06:02 +03:00 |
|
Nat Goodspeed
|
ca6f092929
|
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
|
2020-05-06 16:06:26 -04:00 |