Megapahit's fork of the Second Life viewer. https://megapahit.org/viewer.git/atom?h=26.1.1 2024-05-22T19:40:26Z 2024-05-22T19:40:26Z Ansariel ansariel.hiller@phoenixviewer.com 2024-05-22T19:25:21Z urn:sha1:e2e37cced861b98de8c1a7c9c0d3a50d2d90e433 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 2024-04-29T04:56:09Z Andrey Lihatskiy alihatskiy@productengine.com 2024-04-29T04:43:28Z urn:sha1:1b68f71348ecf3983b76b40d7940da8377f049b7 2024-02-21T01:00:25Z Ansariel ansariel.hiller@phoenixviewer.com 2024-02-20T12:57:07Z urn:sha1:8c16ec2b53153a10f40181e0e8108d24331451d4 2021-04-09T22:38:17Z Mnikolenko Productengine mnikolenko@productengine.com 2021-04-09T22:38:17Z urn:sha1:94ce45441d3e00a8ff2dac6c41be23fa04cee31b 2020-06-11T17:54:09Z Mnikolenko Productengine mnikolenko@productengine.com 2020-06-11T17:54:09Z urn:sha1:905005be3c7e15429d8380c99d7590e677482286 2019-10-23T17:27:05Z andreykproductengine andreykproductengine@lindenlab.com 2019-10-23T17:27:05Z urn:sha1:5591515f193a1ae3ec0dfcee4020636e529af859 2017-02-03T21:46:46Z Nat Goodspeed nat@lindenlab.com 2017-02-03T21:46:46Z urn:sha1:ead15a8ff5cfbfbb15f42c1f73910a3fa65d4741 At some point the INTEGRATION_TEST_llurlentry build changed so that the library(ies) we attempted to stub out got linked in anyway, so that instead of simplifying the test, the stubs broke it with "duplicate symbol" errors. Commenting out the stubs permits the test program to succeed. 2016-04-04T19:53:09Z Oz Linden oz@lindenlab.com 2016-04-04T19:53:09Z urn:sha1:9be58e915a6c69de280ccabd3019e9ac40beed26 2016-03-17T20:14:21Z Rider Linden rider@lindenlab.com 2016-03-17T20:14:21Z urn:sha1:b8c1976460374e743743728ef49b38ad52c453a4