viewer.git/indra/newview/llfloaterauction.cpp, branch cef_147 Megapahit's fork of the Second Life viewer. https://megapahit.org/viewer.git/atom?h=cef_147 2024-05-22T19:40:26Z Fix line endlings 2024-05-22T19:40:26Z Ansariel ansariel.hiller@phoenixviewer.com 2024-05-22T19:25:21Z urn:sha1:e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A 2024-05-22T17:04:52Z Ansariel ansariel.hiller@phoenixviewer.com 2024-05-22T17:04:52Z urn:sha1:1b67dd855c41f5a0cda7ec2a68d98071986ca703 # 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 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29T04:56:09Z Andrey Lihatskiy alihatskiy@productengine.com 2024-04-29T04:43:28Z urn:sha1:1b68f71348ecf3983b76b40d7940da8377f049b7 Remove more orphaned files 2024-03-05T14:42:09Z Ansariel ansariel.hiller@phoenixviewer.com 2024-03-05T14:10:12Z urn:sha1:043a92997f187826ad26ff269613c8f0ed11379f Convert remaining BOOL to bool 2024-02-21T21:14:31Z Ansariel ansariel.hiller@phoenixviewer.com 2024-02-21T20:05:14Z urn:sha1:60d3dd98a44230c21803c1606552ee098ed9fa7c Convert BOOL to bool in llui 2024-02-21T01:00:25Z Ansariel ansariel.hiller@phoenixviewer.com 2024-02-20T22:46:23Z urn:sha1:a5261a5fa8fad810ecb5c260d92c3e771822bf58 SL-20743 Use LLMutex in LLImageBase for internal data thread-safety 2023-12-21T18:12:52Z Alexander Gavriliuk alexandrgproductengine@lindenlab.com 2023-12-15T17:26:14Z urn:sha1:74c8b028d42a8c5b080bb861e427f38cedd4ad7c This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal 2021-03-09T22:39:51Z Callum Prentice callum@lindenlab.com 2021-03-09T22:39:51Z urn:sha1:168d177197bd7558bbe0ca13d01c984ad8638da7 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 2021-03-08T13:56:16Z Brad Payne (Vir Linden) vir@lindenlab.com 2021-03-08T13:56:16Z urn:sha1:c83e740ef94e16ba85574454f3138905edecb029 This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5. Replace references to static writefile with write so we end up with only a single read and a single write function 2020-10-07T01:18:18Z Callum Prentice callum@gmail.com 2020-10-07T01:18:18Z urn:sha1:a0ea119623b8bda445f86afdb0ea7b5833c8e171